summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2009-07-20 12:28:46 -0700
committerDaniel Burrows <dburrows@debian.org>2009-07-20 12:28:46 -0700
commitccf5cb2ea1ad5b032aa547279400d8b798c556a2 (patch)
tree282d0645a77f64bec46a579ad3dc80e2341e459c /po
parent5bbeb9e243bbe5539d414e8db7e0d1e1208d78f5 (diff)
downloadaptitude-ccf5cb2ea1ad5b032aa547279400d8b798c556a2.tar.gz
Update the pofiles.
Diffstat (limited to 'po')
-rw-r--r--po/aptitude.pot607
-rw-r--r--po/ar.po731
-rw-r--r--po/ast.po686
-rw-r--r--po/bs.po630
-rw-r--r--po/ca.po733
-rw-r--r--po/cs.po726
-rw-r--r--po/da.po726
-rw-r--r--po/de.po733
-rw-r--r--po/dz.po733
-rw-r--r--po/el.po733
-rw-r--r--po/es.po854
-rw-r--r--po/eu.po726
-rw-r--r--po/fi.po734
-rw-r--r--po/fr.po686
-rw-r--r--po/gl.po733
-rw-r--r--po/hu.po731
-rw-r--r--po/it.po728
-rw-r--r--po/ja.po757
-rw-r--r--po/km.po731
-rw-r--r--po/ku.po693
-rw-r--r--po/lt.po726
-rw-r--r--po/mr.po731
-rw-r--r--po/nb.po733
-rw-r--r--po/ne.po726
-rw-r--r--po/nl.po726
-rw-r--r--po/nn.po718
-rw-r--r--po/pl.po726
-rw-r--r--po/pt.po733
-rw-r--r--po/pt_BR.po733
-rw-r--r--po/ro.po733
-rw-r--r--po/ru.po726
-rw-r--r--po/sk.po739
-rw-r--r--po/sv.po733
-rw-r--r--po/th.po614
-rw-r--r--po/tl.po718
-rw-r--r--po/tr.po731
-rw-r--r--po/uk.po726
-rw-r--r--po/vi.po726
-rw-r--r--po/zh_CN.po733
-rw-r--r--po/zh_TW.po733
40 files changed, 13739 insertions, 15136 deletions
diff --git a/po/aptitude.pot b/po/aptitude.pot
index c0815578..ceea1712 100644
--- a/po/aptitude.pot
+++ b/po/aptitude.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -516,8 +516,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr ""
-#: 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 ""
@@ -1490,7 +1490,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 ""
@@ -1587,7 +1587,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr ""
#: 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 ""
@@ -1721,8 +1721,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 ""
@@ -1801,12 +1801,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 ""
@@ -1959,8 +1959,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 ""
@@ -2095,7 +2094,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 ""
@@ -2357,44 +2356,44 @@ 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
msgid "Safe actions"
msgstr ""
-#: src/generic/apt/aptitude_resolver_universe.cc:872
+#: src/generic/apt/aptitude_resolver_universe.cc:879
msgid "Cancel all user actions"
msgstr ""
-#: src/generic/apt/aptitude_resolver_universe.cc:873
+#: src/generic/apt/aptitude_resolver_universe.cc:880
msgid "Remove packages"
msgstr ""
-#: src/generic/apt/aptitude_resolver_universe.cc:874
+#: src/generic/apt/aptitude_resolver_universe.cc:881
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
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 "
@@ -2824,299 +2823,208 @@ msgstr ""
msgid "_File"
msgstr ""
-#: 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
-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
-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
-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
-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
-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
-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
-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
-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
-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"
msgstr ""
-#: src/gtk/aptitude.glade:180
-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
-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
-msgid "gtk-delete"
-msgstr ""
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
msgid "_Package"
msgstr ""
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
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
-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
-msgid "gtk-close"
-msgstr ""
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
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
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
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
-msgid "Purge"
-msgstr ""
-
-#: 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
msgid "Make this the default for new package lists."
msgstr ""
-#: src/gtk/aptitude.glade:747
+#: src/gtk/aptitude.glade:646
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
+msgid "gtk-close"
+msgstr ""
+
+#: src/gtk/aptitude.glade:719 src/gtk/aptitude.glade:1425
+#: src/gtk/aptitude.glade:1754 src/gtk/aptitude.glade:1892
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
msgid "Incremental"
msgstr ""
-#: 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
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
msgid "Dependencies"
msgstr ""
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
msgid "Changelog"
msgstr ""
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
msgid "Files"
msgstr ""
-#: 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
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
+msgid "Status"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1216
+msgid "Group by action type"
+msgstr ""
+
+#: 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 "
@@ -3125,126 +3033,113 @@ msgid ""
"This is the default view mode."
msgstr ""
-#: src/gtk/aptitude.glade:1232
-msgid "Group by action type"
+#: 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
msgid "Rejected"
msgstr ""
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
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
-msgid "Status"
-msgstr ""
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
msgstr ""
-#: src/gtk/aptitude.glade:1442
+#: src/gtk/aptitude.glade:1373
msgid "Calculate the next solution that has not yet been generated."
msgstr ""
-#: src/gtk/aptitude.glade:1443
-msgid "Find a new solution"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
msgstr ""
-#: src/gtk/aptitude.glade:1457
+#: src/gtk/aptitude.glade:1388
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
msgid "Upgrade Summary"
msgstr ""
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
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
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
msgid "gtk-yes"
msgstr ""
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3290,34 +3185,34 @@ msgstr ""
msgid "Downloading changelogs"
msgstr ""
-#: 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
msgid "Preparing to download changelogs"
msgstr ""
-#: src/gtk/dashboardtab.cc:396
+#: src/gtk/dashboardtab.cc:397
msgid "Available upgrades:"
msgstr ""
-#: src/gtk/dashboardtab.cc:413
+#: src/gtk/dashboardtab.cc:414
#, c-format
msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
msgid "No upgrades are available."
msgstr ""
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
msgid "Unable to calculate an upgrade."
msgstr ""
-#: 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 "
@@ -3328,7 +3223,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3339,42 +3234,42 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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
#, c-format
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
msgid "Find dependency chains: start"
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
msgid "Find dependency chains: end"
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
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
msgid "No dependency chain found."
msgstr ""
@@ -3592,6 +3487,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 ""
@@ -3752,6 +3651,18 @@ msgstr ""
msgid "Install/Upgrade"
msgstr ""
+#: src/gtk/gui.cc:1377
+msgid "Purge"
+msgstr ""
+
+#: 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 ""
@@ -3805,114 +3716,114 @@ 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
#, c-format
msgid "No packages matched \"%s\"."
msgstr ""
-#: 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
msgid "Packages: "
msgstr ""
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, c-format
msgid "Upgrade to %s version %s"
msgstr ""
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, c-format
msgid "Install %s version %s"
msgstr ""
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, c-format
msgid "Downgrade to %s version %s"
msgstr ""
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, c-format
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
#, c-format
msgid "Cancel any actions on %s."
msgstr ""
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, c-format
msgid "Cancel the purge of %s."
msgstr ""
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, c-format
msgid "Cancel the removal of %s."
msgstr ""
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, c-format
msgid "Cancel the upgrade of %s."
msgstr ""
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, c-format
msgid "Cancel the installation of %s."
msgstr ""
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, c-format
msgid "Cancel the downgrade of %s."
msgstr ""
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, c-format
msgid "Cancel the reinstallation of %s."
msgstr ""
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, c-format
msgid "Remove %s"
msgstr ""
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, c-format
msgid "Purge %s"
msgstr ""
-#: 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
#, c-format
msgid "Mark %s as automatically installed."
msgstr ""
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, c-format
msgid "Mark %s as manually installed."
msgstr ""
-#: src/gtk/packagestab.cc:643
+#: src/gtk/packagestab.cc:646
#, c-format
msgid "%s is a virtual package provided by:\n"
msgstr ""
-#: 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
msgid "Source: "
msgstr ""
@@ -3936,24 +3847,24 @@ msgstr ""
msgid "%s is being installed manually."
msgstr ""
-#: 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
msgid "Searching..."
msgstr ""
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
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 "
@@ -3963,7 +3874,7 @@ msgid ""
"either on your system or in the Debian archive."
msgstr ""
-#: 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 "
@@ -3971,74 +3882,74 @@ msgid ""
"package declaring an 'important' dependency on them.\n"
msgstr ""
-#: 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 "
"state to avoid breaking dependencies."
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 "
"package you have chosen for installation."
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 "
"is no longer available, or because another package conflicts with them."
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 "
"installed."
msgstr ""
-#: 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 "
"their current version."
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."
msgstr ""
-#: 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 "
"computer."
msgstr ""
-#: 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."
msgstr ""
-#: 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."
msgstr ""
-#: 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 "
"made to complete their installation."
msgstr ""
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
msgid "Preview: "
msgstr ""
@@ -4056,110 +3967,114 @@ msgid ""
"%s"
msgstr ""
-#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275
+#: src/gtk/resolver.cc:207
+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
#, c-format
msgid "Removing %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:337
+#: src/gtk/resolver.cc:377
#, c-format
msgid "Canceling the installation of %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, c-format
msgid "Canceling the removal of %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, c-format
msgid "Keeping %s at version %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, c-format
msgid "Installing %s version %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, c-format
msgid "Upgrading %s to version %s is rejected."
msgstr ""
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4169,7 +4084,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4177,234 +4092,244 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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
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
msgid "Leave the following dependencies unresolved:"
msgstr ""
-#: src/gtk/resolver.cc:1444
+#: src/gtk/resolver.cc:1502
#, c-format
msgid "Remove %s [<big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1451
+#: src/gtk/resolver.cc:1509
#, c-format
msgid "Install %s [<big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, c-format
msgid "Cancel the installation of %s"
msgstr ""
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, c-format
msgid "Cancel the removal of %s"
msgstr ""
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, c-format
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr ""
-#: src/gtk/resolver.cc:1472
+#: src/gtk/resolver.cc:1530
#, c-format
msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1481
+#: src/gtk/resolver.cc:1539
#, c-format
msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>Remove</b> %s"
msgstr ""
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>remove</b> %s"
msgstr ""
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, c-format
msgid "<b>Keep</b> %s at version %s"
msgstr ""
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, c-format
msgid "<b>keep</b> %s at version %s"
msgstr ""
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, c-format
+msgid "<b>Cancel</b> the installation of %s"
+msgstr ""
+
+#: src/gtk/resolver.cc:1615
+#, c-format
+msgid "<b>cancel</b> the installation of %s"
+msgstr ""
+
+#: src/gtk/resolver.cc:1622
#, c-format
msgid "<b>Install</b> %s %s"
msgstr ""
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1622
#, c-format
msgid "<b>install</b> %s %s"
msgstr ""
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>Upgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>upgrade</b> %s to version %s"
msgstr ""
-#: 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
#, c-format
msgid "%s install"
msgid_plural "%s installs"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, c-format
msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, c-format
msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, c-format
msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, c-format
msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, c-format
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
msgid "No solutions yet."
msgstr ""
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
msgid "No dependency solution was found."
msgstr ""
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
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
#, c-format
msgid "%u solutions."
msgstr ""
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 2c6cdf57..089c8f3f 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_po\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: 2006-10-22 16:18+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -526,8 +526,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 "خطأ داخلي: حلّ غير فارغ متوقع."
@@ -1572,7 +1572,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "إرضاء المعتمدات..."
@@ -1673,7 +1673,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>"
@@ -1809,8 +1809,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 "النسخة: "
@@ -1889,12 +1889,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 "الوصف: "
@@ -2060,8 +2060,7 @@ msgstr ""
msgid "Candidate"
msgstr "CandVer"
-#: 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 "تثبيت"
@@ -2201,7 +2200,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 "علامات"
@@ -2470,54 +2469,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 "
@@ -2960,97 +2959,43 @@ msgstr ""
msgid "_File"
msgstr "إغلاق"
-#: 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"
@@ -3058,259 +3003,199 @@ msgstr ""
"استخدم 'su' كي تصبح المستخدم root؛ سيقوم هذا بإعادة تشغيل البرنامج، ولكن "
"سيتم الإبقاء على إعداداتك"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "تحوُّل إلى root"
-
-#: 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 "حذف"
-
-#: 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 "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 "حذف"
-
-#: 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 "^إلغاء"
-
-#: 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 "حذف"
+
+#: 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 "إعادة تثبيت"
-#: 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 "^سجل التغيير"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
msgid "Files"
msgstr "إغلاق"
-#: 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 "
@@ -3319,149 +3204,130 @@ 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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-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 "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 ""
@@ -3514,21 +3380,21 @@ msgstr "تنزيل سجل التغيير"
msgid "Downloading changelogs"
msgstr "تنزيل سجل التغيير"
-#: 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"
@@ -3539,19 +3405,19 @@ msgstr[1] "ترقيتان"
msgstr[2] "%d ترقيات"
msgstr[3] "%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 "
@@ -3564,7 +3430,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: 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'>"
@@ -3577,46 +3443,46 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: 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 "Find dependency chains: start"
msgstr "إ^دارة المعتمدات"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
msgid "Find dependency chains: end"
msgstr "إ^دارة المعتمدات"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
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 "No dependency chain found."
msgstr "إ^دارة المعتمدات"
@@ -3875,6 +3741,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 ""
@@ -4075,6 +3945,20 @@ msgstr "غير مثبتة"
msgid "Install/Upgrade"
msgstr "مُثبّتة"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^إلغاء"
+
+#: 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 ""
@@ -4136,129 +4020,129 @@ 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 version %s"
msgstr "تثبيت %s %s (%s)"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "نسخة libsigc++: %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"
msgstr "إزالة"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^إلغاء"
-#: 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 "Mark %s as manually installed."
msgstr "'&m' لتحديد الحزم بالتثبيت اليدوي"
-#: 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: "
@@ -4288,28 +4172,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 "
@@ -4323,7 +4207,7 @@ msgstr ""
" \n"
" وجود هذه الشجرة قد يعني أن شيء ما معطوب، إما على نظامك أو في ارشيف دبيان."
-#: 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 "
@@ -4334,7 +4218,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 "
@@ -4343,7 +4227,7 @@ msgstr ""
"الحزم التي سيُبقى عليها بوضعها الحالي\n"
" يمكن ترقية هذه الحزم، إلا أنّه أُبقي عليها بوضعها الحالي لتجنّب عطب المعتمدات."
-#: 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 "
@@ -4352,7 +4236,7 @@ msgstr ""
"الحزم التي سيتم تثبيتها تلقائيّاً لاستيفاء المعتمدات\n"
" يتم تثبيت هذه الحزم بسبب الحاجة إليها من قبل حزمة أخرى اخترتها للتثبيت."
-#: 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 "
@@ -4362,7 +4246,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 "
@@ -4371,7 +4255,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 "
@@ -4380,7 +4264,7 @@ msgstr ""
"الحزم التي سيُبقى عليها\n"
" يمكن ترقية هذه الحزم، إلا أنّك طلبت إبقائها على نسختها الحاليّة."
-#: 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."
@@ -4388,7 +4272,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 "
@@ -4397,7 +4281,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."
@@ -4405,7 +4289,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."
@@ -4413,7 +4297,7 @@ msgstr ""
"الحزم المطلوب ترقيتها\n"
"ستتم ترقية هذه الحزم إلى نسخة أجدد."
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4423,7 +4307,7 @@ msgstr ""
"الحزم التي سيتم تثبيتها تلقائيّاً لاستيفاء المعتمدات\n"
" يتم تثبيت هذه الحزم بسبب الحاجة إليها من قبل حزمة أخرى اخترتها للتثبيت."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4444,103 +4328,109 @@ 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 "Installing %s version %s is rejected."
msgstr "تثبيت %s %s (%s)"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "نسخة libsigc++: %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] ""
@@ -4548,7 +4438,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: 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] ""
@@ -4556,7 +4446,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4568,7 +4458,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4578,188 +4468,200 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: 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
#, fuzzy, 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 "<b>Remove</b> %s"
msgstr "إزالة"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "إزالة"
-#: 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 "<b>Downgrade</b> %s to version %s"
msgstr "نسخة libsigc++: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "نسخة libsigc++: %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"
@@ -4770,7 +4672,7 @@ msgstr[1] "تثبيتان"
msgstr[2] "%d تثبيتات"
msgstr[3] "%d تثبيت"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4781,7 +4683,7 @@ msgstr[1] "إزالتان"
msgstr[2] "%d إزالات"
msgstr[3] "%d إزالة"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4792,7 +4694,7 @@ msgstr[1] "إبقاءان"
msgstr[2] "%d إبقاءات"
msgstr[3] "%d إبقاء"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4803,7 +4705,7 @@ msgstr[1] "ترقيتان"
msgstr[2] "%d ترقيات"
msgstr[3] "%d ترقية"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4814,7 +4716,7 @@ msgstr[1] "تثبيطان"
msgstr[2] "%d تثبيطات"
msgstr[3] "%d تثبيط"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4824,34 +4726,34 @@ msgstr[1] "التدقيق بالتو^صيات"
msgstr[2] "التدقيق بالتو^صيات"
msgstr[3] "التدقيق بالتو^صيات"
-#: 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 "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 ""
@@ -7601,6 +7503,75 @@ msgid "Download Changelog"
msgstr "تنزيل سجل التغيير"
#, 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 "تحوُّل إلى root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^خروج"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "حذف"
+
+#, fuzzy
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "إ^دارة المعتمدات"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "عرض شرح للتغييرات المقدمة في الحل"
+
+#, fuzzy
#~ msgid "Dependency Chain"
#~ msgstr "إ^دارة المعتمدات"
diff --git a/po/ast.po b/po/ast.po
index f2eb4d43..ceccf78f 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.11.11\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: 2009-04-26 17:44+0100\n"
"Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
"com>\n"
@@ -635,8 +635,8 @@ msgstr "Fallu grave al iguar"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Resolviendo dependencies"
-#: 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 "Fallu internu: Solución vacía nun esperada."
@@ -1712,7 +1712,7 @@ msgstr ""
"dependencies."
#: 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 "Resolviendo dependencies..."
@@ -1817,7 +1817,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Los siguientes paquetes tienes dependencies nun satisfeches:\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>"
@@ -1951,8 +1951,8 @@ msgstr "Instaláu automaticamente"
msgid "no"
msgstr "non"
-#: 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 "Versión: "
@@ -2031,12 +2031,12 @@ msgid "Obsoletes"
msgstr "Fae obsoletu a"
#: 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 "Proporciona"
#: 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 "Descripción: "
@@ -2192,8 +2192,7 @@ msgstr "Autual"
msgid "Candidate"
msgstr "Candidatu"
-#: 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 "Instalar"
@@ -2330,7 +2329,7 @@ msgstr "NON SATISFECHO"
msgid "UNAVAILABLE"
msgstr "NUN DISPONIBLE"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Etiquetes"
@@ -2609,7 +2608,7 @@ msgstr ""
"Pista \"%s\" nun válida: l'aición \"%s\" tendría que ser \"aceutar\", "
"\"reintentar\", o un númberu."
-#: 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)."
@@ -2617,31 +2616,31 @@ msgstr ""
"Nivel de gueta nun válidu \"%s\" (non \"conflict\", \"minimum\", o un "
"enteru)."
-#: src/generic/apt/aptitude_resolver_universe.cc:871
+#: src/generic/apt/aptitude_resolver_universe.cc:878
msgid "Safe actions"
msgstr "Aiciones Segures"
-#: src/generic/apt/aptitude_resolver_universe.cc:872
+#: src/generic/apt/aptitude_resolver_universe.cc:879
msgid "Cancel all user actions"
msgstr "Enc^aboxar toles aiciones d'usuariu"
-#: src/generic/apt/aptitude_resolver_universe.cc:873
+#: src/generic/apt/aptitude_resolver_universe.cc:880
msgid "Remove packages"
msgstr "Desaniciar paquetes"
-#: src/generic/apt/aptitude_resolver_universe.cc:874
+#: src/generic/apt/aptitude_resolver_universe.cc:881
msgid "Modify held packages"
msgstr "Modificar paquetes manteníos"
-#: src/generic/apt/aptitude_resolver_universe.cc:875
+#: src/generic/apt/aptitude_resolver_universe.cc:882
msgid "Install versions from non-default sources"
msgstr "Versiones instalaes dende fontes que nun son por defeutu"
-#: src/generic/apt/aptitude_resolver_universe.cc:876
+#: src/generic/apt/aptitude_resolver_universe.cc:883
msgid "Remove essential packages"
msgstr "Desaniciar los paquetes esenciales"
-#: 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 "
@@ -2650,7 +2649,7 @@ msgstr ""
"El nivel \"%s\", configuráu en %s::ProblemResolver::Tier-Names, necesita una "
"entrada Tier."
-#: 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 "
@@ -3109,82 +3108,46 @@ msgstr "Xestor de Paquetes Aptitude"
msgid "_File"
msgstr "_Ficheru"
-#: 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 "Facer toles instalaciones y desaniciaos pendientes"
-#: src/gtk/aptitude.glade:27
-msgid "_Install/Remove Packages"
-msgstr "_Instalar/desaniciar paquetes"
-
-#: 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 "Comprobar por nueves versiones de paquetes"
-#: src/gtk/aptitude.glade:43
-msgid "_Update Package List"
-msgstr "_Anovar llista de paquetes"
-
-#: 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 ""
"Conseñar tolos paquetes anovables que nun ten reteníos pa que seyan anovaos"
-#: src/gtk/aptitude.glade:64
-msgid "Mark Up_gradable"
-msgstr "Marcar _anovable"
-
-#: 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 "Escaecer qué paquetes son \"nuevos\""
-#: src/gtk/aptitude.glade:80
-msgid "_Forget New Packages"
-msgstr "_Escaecer Paquetes Nuevos"
-
-#: 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 ""
"Encaboxar toles instalaciones, desaniciaos, bloqueos y anovamientos "
"pendientes."
-#: src/gtk/aptitude.glade:95
-msgid "Canc_el Pending Actions"
-msgstr "Enc_aboxar Aiciones Pendientes"
-
-#: 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 "Esborrar ficheros de paquete baxaos previamente"
-#: src/gtk/aptitude.glade:110
-msgid "C_lean Package Cache"
-msgstr "_Llimpiar la Caché de Paquetes"
-
-#: 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 "Desaniciar ficheros de paquetes que nun pueden ser baxaos"
-#: src/gtk/aptitude.glade:125
-msgid "Clean _Obsolete Files"
-msgstr "Llimpiar ficheros _obsoletos"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Recargar caché de paquetes"
-#: src/gtk/aptitude.glade:145
-msgid "_Reload Package Cache"
-msgstr "_Recargar Caché de Paquetes"
-
-#: 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 "Pierde'l to tiempu intentando guetar les mines"
-#: src/gtk/aptitude.glade:160
-msgid "_Play Minesweeper"
-msgstr "_Xugar al Guetamines"
-
-#: 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"
@@ -3192,222 +3155,167 @@ msgstr ""
"Executa 'su' pa convertite n'alministrador; esto reaniciará'l programa, pero "
"caltendránse les tos preferencies"
-#: src/gtk/aptitude.glade:180
-msgid "_Become Root"
-msgstr "_Convertise n'Alministrador"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Colar del programa"
-#: src/gtk/aptitude.glade:195
-msgid "_Quit"
-msgstr "_Colar"
-
-#: src/gtk/aptitude.glade:212
+#: src/gtk/aptitude.glade:147
msgid "E_dit"
msgstr "E_ditar"
-#: 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 "Desfacer la cabera operación o grupu d'operaciones sobre los paquetes"
-#: src/gtk/aptitude.glade:221
-msgid "gtk-undo"
-msgstr "gtk-desfacer"
-
-#: src/gtk/aptitude.glade:234
-msgid "gtk-cut"
-msgstr "gtk-cortar"
-
-#: src/gtk/aptitude.glade:242
-msgid "gtk-copy"
-msgstr "gtk-copiar"
-
-#: src/gtk/aptitude.glade:250
-msgid "gtk-paste"
-msgstr "gtk-apegar"
-
-#: src/gtk/aptitude.glade:258
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
msgid "_Package"
msgstr "_Paquete"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
msgid "_View"
msgstr "_VEr"
-#: src/gtk/aptitude.glade:290
+#: src/gtk/aptitude.glade:226
msgid "Change which columns are visible in the currently active view."
msgstr "Camudar qué columnes son visibles na vista activa actual."
-#: src/gtk/aptitude.glade:291
-msgid "_Edit Columns..."
-msgstr "_Editar Columnes..."
-
-#: 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 ""
"Ver fallos qu'asocedieron nel sistema apt dende que s'anició el programa."
-#: src/gtk/aptitude.glade:311
-msgid "View Apt _Errors"
-msgstr "Ver _Fallos de Apt"
-
-#: src/gtk/aptitude.glade:325
+#: src/gtk/aptitude.glade:249
msgid "Find chains of dependencies linking one package to another."
msgstr "Guetar cadenes dependencies d'un paquete enllazáu a otru."
-#: src/gtk/aptitude.glade:326
-msgid "Find _Dependency Chains"
-msgstr "Atopar _Cadenes de Dependencies"
-
-#: src/gtk/aptitude.glade:345
-msgid "gtk-go-back"
-msgstr "gtk-dir-atrás"
-
-#: src/gtk/aptitude.glade:355
-msgid "gtk-go-forward"
-msgstr "gtk-dir-alantre"
-
-#: src/gtk/aptitude.glade:365 src/gtk/aptitude.glade:765
-msgid "gtk-close"
-msgstr "gtk-zarrar"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
msgid "_Help"
msgstr "_Aida"
-#: src/gtk/aptitude.glade:387
-msgid "gtk-about"
-msgstr "gtk-about"
-
-#: 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 "Dashboard"
-#: src/gtk/aptitude.glade:422
+#: src/gtk/aptitude.glade:344
msgid "Update"
msgstr "Anovar"
-#: 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 "Paquetes"
-#: 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 "Previsualizar"
-#: 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 "iguador"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
msgid "Install/Remove"
msgstr "Instalar/Desaniciar"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Desaniciar"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-msgid "Purge"
-msgstr "Purgar"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Caltener"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Retener"
-
-#: src/gtk/aptitude.glade:687
+#: src/gtk/aptitude.glade:590
msgid "Edit Columns..."
msgstr "Editar Columnes..."
-#: src/gtk/aptitude.glade:700
+#: src/gtk/aptitude.glade:603
msgid "Dummy label (will be replaced at runtime)."
msgstr "Etiqueta Ficticia (será camudada en tiempu d'execución)."
-#: src/gtk/aptitude.glade:731
+#: src/gtk/aptitude.glade:631
msgid "Make this the default for new package lists."
msgstr "Facer esto por defeutu pa les nueves llistes de paquetes."
-#: src/gtk/aptitude.glade:747
+#: src/gtk/aptitude.glade:646
msgid "Apply these settings to all active package lists."
msgstr "Aplicar estes opciones a toles llistes de paquetes actives."
-#: 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
+msgid "gtk-close"
+msgstr "gtk-zarrar"
+
+#: src/gtk/aptitude.glade:719 src/gtk/aptitude.glade:1425
+#: src/gtk/aptitude.glade:1754 src/gtk/aptitude.glade:1892
msgid "Search:"
msgstr "Guetar:"
-#: 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 "gtk-atopar"
-#: src/gtk/aptitude.glade:845
+#: src/gtk/aptitude.glade:750
msgid "Incremental"
msgstr "Incremental"
-#: 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
msgid "Errors"
msgstr "Errores"
-#: 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 "Amosar"
-#: src/gtk/aptitude.glade:986
+#: src/gtk/aptitude.glade:895
msgid "<span size=\"xx-large\">Versions:</span>"
msgstr "<span size=\"xx-large\">Versiones:</span>"
-#: src/gtk/aptitude.glade:1046
+#: src/gtk/aptitude.glade:956
msgid "Dependencies"
msgstr "Dependencies"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
msgid "Changelog"
msgstr "Rexistru de cambeos"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
msgid "Files"
msgstr "Ficheros"
-#: src/gtk/aptitude.glade:1115
+#: src/gtk/aptitude.glade:1025
msgid "popcon"
msgstr "popcon"
-#: src/gtk/aptitude.glade:1124
+#: src/gtk/aptitude.glade:1034
msgid "Popcon"
msgstr "Popcon"
-#: src/gtk/aptitude.glade:1135
+#: src/gtk/aptitude.glade:1045
msgid "tags"
msgstr "etiquetes"
-#: src/gtk/aptitude.glade:1192
+#: src/gtk/aptitude.glade:1106
msgid "Fixing upgrade manually:"
msgstr "Igüando actualización manualmente:"
-#: src/gtk/aptitude.glade:1202 src/gtk/dashboardtab.cc:536
+#: src/gtk/aptitude.glade:1116 src/gtk/dashboardtab.cc:537
msgid "Calculating upgrade..."
msgstr "Calculando actualización..."
-#: src/gtk/aptitude.glade:1229
+#: src/gtk/aptitude.glade:1164
+msgid "<b>Solutions</b>"
+msgstr "<b>Soluciones</b>"
+
+#: src/gtk/aptitude.glade:1182 src/gtk/download.cc:261
+#: src/gtk/entityview.cc:551
+msgid "Status"
+msgstr "Estáu"
+
+#: src/gtk/aptitude.glade:1216
+msgid "Group by action type"
+msgstr "Grupu por tipu d'aición"
+
+#: 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 "
@@ -3421,11 +3329,11 @@ msgstr ""
"\n"
"Esti ye'l mou de visualización por defeuto."
-#: src/gtk/aptitude.glade:1232
-msgid "Group by action type"
-msgstr "Grupu por tipu d'aición"
+#: 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."
@@ -3433,67 +3341,54 @@ msgstr ""
"Amosar l'orden nel que les aiciones na solución actual ficiéronse y la "
"dependencia que provocó cada aición."
-#: src/gtk/aptitude.glade:1246
-msgid "Show an explanation of the solution"
-msgstr "Amosar una esplicación de la solución"
-
-#: src/gtk/aptitude.glade:1263
+#: src/gtk/aptitude.glade:1255
msgid "<b>View Mode</b>"
msgstr "<b>Mou Ver</b>"
-#: src/gtk/aptitude.glade:1307
+#: src/gtk/aptitude.glade:1297
msgid "Rejected"
msgstr "Espulsar"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
msgid "No preference"
msgstr "Ensín preferencia"
-#: src/gtk/aptitude.glade:1331
+#: src/gtk/aptitude.glade:1328
msgid "Accepted"
msgstr "Aceptáu"
-#: src/gtk/aptitude.glade:1347
+#: src/gtk/aptitude.glade:1348
msgid "<b>Status of selected action</b>"
msgstr "<b>Estáu de l'aición seleicionada</b>"
-#: src/gtk/aptitude.glade:1364 src/gtk/download.cc:261
-#: src/gtk/entityview.cc:551
-msgid "Status"
-msgstr "Estáu"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr "<b>Soluciones</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
+msgstr "Atopar una nueva solución"
-#: src/gtk/aptitude.glade:1442
+#: src/gtk/aptitude.glade:1373
msgid "Calculate the next solution that has not yet been generated."
msgstr "Calcular la siguiente solución que nun fué tovia xenerada."
-#: src/gtk/aptitude.glade:1443
-msgid "Find a new solution"
-msgstr "Atopar una nueva solución"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
+msgstr "gtk-aplicar"
-#: src/gtk/aptitude.glade:1457
+#: src/gtk/aptitude.glade:1388
msgid ""
"Perform the actions in the currently selected solution and close this tab."
msgstr ""
"Facer les aiciones na solución seleicionada actualmente y zarrar esta "
"llingüeta."
-#: src/gtk/aptitude.glade:1458
-msgid "gtk-apply"
-msgstr "gtk-aplicar"
-
-#: src/gtk/aptitude.glade:1607
+#: src/gtk/aptitude.glade:1543
msgid "Upgrade Summary"
msgstr "Resume d'Anovamientu"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
msgid "Selected Package"
msgstr "Paquete Esbilláu: "
-#: 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."
@@ -3501,31 +3396,31 @@ msgstr ""
"Etiqueta espicando l'actualización. Esti testu nun aparecerá nel programa en "
"tiempu d'execución."
-#: src/gtk/aptitude.glade:1682
+#: src/gtk/aptitude.glade:1619
msgid "Fix Manually"
msgstr "Igüar Manualmente"
-#: 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 "Anovar"
-#: src/gtk/aptitude.glade:1718
+#: src/gtk/aptitude.glade:1663
msgid "<b>Available Upgrades:</b>"
msgstr "<b>Anovamientos Disponibles:</b>"
-#: src/gtk/aptitude.glade:1911
+#: src/gtk/aptitude.glade:1858
msgid "<b>Start at these packages:</b>"
msgstr "<b>Entamar en estos paquetes:</b>"
-#: src/gtk/aptitude.glade:2047
+#: src/gtk/aptitude.glade:1996
msgid "<b>End at these packages:</b>"
msgstr "<b>Finar en estos paquetes:</b>"
-#: src/gtk/aptitude.glade:2115
+#: src/gtk/aptitude.glade:2064
msgid "A terminal running dpkg will appear here."
msgstr "Un terminal executando dpkg aparecerá equí."
-#: src/gtk/aptitude.glade:2127
+#: src/gtk/aptitude.glade:2076
msgid ""
"Placeholder label for the explanation that two conffiles are being "
"compared.\n"
@@ -3535,11 +3430,11 @@ msgstr ""
"configuración que se comparen.\n"
"Esti testu nun debe aparecer nel programa."
-#: src/gtk/aptitude.glade:2153
+#: src/gtk/aptitude.glade:2105
msgid "View the differences\t"
msgstr "Ver les diferencies\t"
-#: 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\"."
@@ -3547,11 +3442,11 @@ msgstr ""
"Quies aplicar esos cambeos?\n"
"Si quies modificar los ficheros a mano, entós calca \"Non\"."
-#: src/gtk/aptitude.glade:2191
+#: src/gtk/aptitude.glade:2143
msgid "gtk-yes"
msgstr "gtk-yes"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr "gtk-non"
@@ -3605,34 +3500,34 @@ msgstr "Baxando Rexistru de cambeos; espere..."
msgid "Downloading changelogs"
msgstr "Baxando Rexistru de Cambeos"
-#: src/gtk/dashboardtab.cc:210
+#: src/gtk/dashboardtab.cc:211
msgid "Resolve Upgrade Manually"
msgstr "Resolver Actualización Manualmente"
-#: src/gtk/dashboardtab.cc:306
+#: src/gtk/dashboardtab.cc:307
msgid "Preparing to download changelogs"
msgstr "Tresnando la descarga rexistru de cambeos"
-#: src/gtk/dashboardtab.cc:396
+#: src/gtk/dashboardtab.cc:397
msgid "Available upgrades:"
msgstr "Anovamientos disponibles:"
-#: src/gtk/dashboardtab.cc:413
+#: src/gtk/dashboardtab.cc:414
#, c-format
msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%d anovamientu disponible:"
msgstr[1] "%d anovamientos disponibles:"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
msgid "No upgrades are available."
msgstr "Ensín actualizaciones disponibles."
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
msgid "Unable to calculate an upgrade."
msgstr "Nun puede calculase una actualización."
-#: 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 "
@@ -3647,7 +3542,7 @@ msgstr[1] ""
"Calca \"%s\" pa instalar <span size='large'>%d</span> actualizaciones fuera "
"de <span size='large'>%d</span>."
-#: 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'>"
@@ -3662,7 +3557,7 @@ msgstr[1] ""
"Calca \"%s\" pa intentar instalar manualmente <span size='large'>%d</span> "
"actualizaciones."
-#: 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 "
@@ -3671,12 +3566,12 @@ msgstr ""
"Nun puede calculase una actualización. Calca \"%s\" pa guetar manualmente "
"una solución."
-#: src/gtk/dashboardtab.cc:704
+#: src/gtk/dashboardtab.cc:705
#, c-format
msgid "Internal error encountered while calculating an upgrade: %s"
msgstr "Fallu internu alcontráu mientres se calculaba una actualización: %s"
-#: 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 "
@@ -3685,23 +3580,23 @@ msgstr ""
"El paquete %s nun tien una versión candidata y nun será actualizable; nun "
"puede amosase'l so rexistru de cambios."
-#: src/gtk/dependency_chains_tab.cc:77
+#: src/gtk/dependency_chains_tab.cc:78
msgid "Find dependency chains: start"
msgstr "Atopar cadenes de dependencia: entamar"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
msgid "Find dependency chains: end"
msgstr "Atopar cadena de dependencia: fin"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
msgid "Find dependency chains: results"
msgstr "Atopar cadenes de dependencia: resultaos"
-#: 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 "Seleiciona ún o más paquetes d'aniciu y un paquete final a guetar."
-#: src/gtk/dependency_chains_tab.cc:276
+#: src/gtk/dependency_chains_tab.cc:281
msgid "No dependency chain found."
msgstr "Nun s'alcontró cadena de dependencia."
@@ -3921,6 +3816,10 @@ msgstr "Reinstalar"
msgid "Downgrade"
msgstr "Baxar de versión"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Desaniciar"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr "Esborrar y desaniciar configuración/datos"
@@ -4090,6 +3989,18 @@ msgstr "Non implementáu"
msgid "Install/Upgrade"
msgstr "Instalar/Anovar"
+#: src/gtk/gui.cc:1377
+msgid "Purge"
+msgstr "Purgar"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Caltener"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Retener"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr "Afitar como automáticu"
@@ -4145,114 +4056,114 @@ msgstr "Info"
msgid "Unknown"
msgstr "Desconocíu"
-#: src/gtk/packagestab.cc:60
+#: src/gtk/packagestab.cc:61
msgid "Parse error"
msgstr "Fallu d'análisis"
-#: src/gtk/packagestab.cc:203
+#: src/gtk/packagestab.cc:204
#, c-format
msgid "No packages matched \"%s\"."
msgstr "Nengún paquete concasa con \"%s\"."
-#: src/gtk/packagestab.cc:313
+#: src/gtk/packagestab.cc:314
msgid "Enter a search and click \"Find\" to display packages."
msgstr "Introduz una gueta y calca \"Atopar\" pa visualizar los paquetes."
-#: src/gtk/packagestab.cc:413
+#: src/gtk/packagestab.cc:416
msgid "Packages: "
msgstr "Paquetes: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, c-format
msgid "Upgrade to %s version %s"
msgstr "Anovar a %s versión %s"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, c-format
msgid "Install %s version %s"
msgstr "Instalar %s versión %s"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, c-format
msgid "Downgrade to %s version %s"
msgstr "Desactualizar a %s versión %s"
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, c-format
msgid "Don't hold %s at its current version."
msgstr "Non caltener %s como versión actual"
-#: 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
#, c-format
msgid "Cancel any actions on %s."
msgstr "Encaboxar aiciones en %s."
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, c-format
msgid "Cancel the purge of %s."
msgstr "Encaboxar purgar %s."
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, c-format
msgid "Cancel the removal of %s."
msgstr "Encaboxar el desaniciu de %s."
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, c-format
msgid "Cancel the upgrade of %s."
msgstr "Encaboxar l'anovamientu de %s."
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, c-format
msgid "Cancel the installation of %s."
msgstr "Encaboxar la instalación de %s."
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, c-format
msgid "Cancel the downgrade of %s."
msgstr "Encaboxar la desactualización de %s."
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, c-format
msgid "Cancel the reinstallation of %s."
msgstr "Encaboxar la reinstalación de %s."
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, c-format
msgid "Remove %s"
msgstr "Desaniciar %s"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, c-format
msgid "Purge %s"
msgstr "Purgar %s"
-#: src/gtk/packagestab.cc:591
+#: src/gtk/packagestab.cc:594
#, c-format
msgid "Hold %s at its current version."
msgstr "Caltener %s na so versión actual."
-#: src/gtk/packagestab.cc:596
+#: src/gtk/packagestab.cc:599
#, c-format
msgid "Mark %s as automatically installed."
msgstr "Conseñar %s como instaláu automáticamente."
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, c-format
msgid "Mark %s as manually installed."
msgstr "Conseñar %s como instaláu manualmente."
-#: src/gtk/packagestab.cc:643
+#: src/gtk/packagestab.cc:646
#, c-format
msgid "%s is a virtual package provided by:\n"
msgstr "%s ye un paquete virtual proporcionáu por:\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 "(más inform...)"
-#: src/gtk/packagestab.cc:736
+#: src/gtk/packagestab.cc:739
msgid "Source: "
msgstr "Fonte: "
@@ -4276,24 +4187,24 @@ msgstr "%s foi instaláu manualmente."
msgid "%s is being installed manually."
msgstr "%s ta siendo instaláu manualmente."
-#: src/gtk/pkgview.cc:399
+#: src/gtk/pkgview.cc:401
msgid "Cache reloading, please wait..."
msgstr "Caché recargando, por favor espere..."
-#: src/gtk/pkgview.cc:604
+#: src/gtk/pkgview.cc:607
msgid "Searching..."
msgstr "Guetando..."
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
msgid "Finalizing view"
msgstr "Finando vista"
-#: 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 "Faciendo vista"
-#: 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 "
@@ -4309,7 +4220,7 @@ msgstr ""
" La presencia d'esti árbol probablemente indica que dalgo ta frayao, nel to "
"sistema o nel ficheru de 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 "
@@ -4321,7 +4232,7 @@ msgstr ""
"satisfacer dependencies, y les aiciones planeaes faerán que nengún paquete "
"instaláu dependa d'ellos de mena 'importante'.\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 "
@@ -4331,7 +4242,7 @@ msgstr ""
" Esos paquetes podríen ser actualizaos, pero conservense nel so estáu actual "
"pa nun frayar nenguna dependencia."
-#: 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 "
@@ -4341,7 +4252,7 @@ msgstr ""
" Esos paquetes instalaránse porque dalgún otru paquete seleicionáu pa "
"instalar necesitalos."
-#: 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 "
@@ -4352,7 +4263,7 @@ msgstr ""
"tán disponibles por más tiempu, o porque otru paquete cria un conflictu con "
"ellos."
-#: 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 "
@@ -4361,7 +4272,7 @@ msgstr ""
"Paquetes pa baxar de versión\n"
" Instalaráse una versión anterior d'esos paquetes que tán anguaño instalaos."
-#: 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 "
@@ -4371,7 +4282,7 @@ msgstr ""
" Esos paquetes pueden anovase, pero pidiste que caltengan la so versión "
"actual."
-#: 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."
@@ -4379,7 +4290,7 @@ msgstr ""
" Paquetes a reinstalar\n"
" Esos paquetes sedrán reinstalaos."
-#: 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 "
@@ -4388,7 +4299,7 @@ msgstr ""
"Paquetes a instalar\n"
" Esos paquetes foron seleicionaos manualmente pa instalar nel to ordenador."
-#: 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."
@@ -4396,7 +4307,7 @@ msgstr ""
"Paquetes a esborrar\n"
" Esos paquetes foron seleicionaos manualmente pa desanicialos."
-#: 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."
@@ -4404,7 +4315,7 @@ msgstr ""
"Paquetes a anovar\n"
" Esos paquetes sedrán anovaos a una versión nueva."
-#: 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 "
@@ -4414,7 +4325,7 @@ msgstr ""
" Esos paquetes nun tán completamente instalaos y configuraos; intentaráse "
"completar la so instalación."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
msgid "Preview: "
msgstr "Previsualizar: "
@@ -4436,51 +4347,57 @@ msgstr ""
"\n"
"%s"
-#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275
+#: src/gtk/resolver.cc:207
+#, fuzzy
+#| msgid "first-package"
+msgid "Virtual package"
+msgstr "Primer paquete"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Ensin Instalar"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, c-format
msgid "Removing %s is rejected."
msgstr "Desaniciando %s ye rechazao."
-#: src/gtk/resolver.cc:337
+#: src/gtk/resolver.cc:377
#, c-format
msgid "Canceling the installation of %s is rejected."
msgstr "Encaboxando la instalación de %s ye rechazao."
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, c-format
msgid "Canceling the removal of %s is rejected."
msgstr "Encaboxando'l desaniciáu de %s ye rechazao."
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, c-format
msgid "Keeping %s at version %s is rejected."
msgstr "Calteniendo %s na versión %s ye rechazao."
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, c-format
msgid "Installing %s version %s is rejected."
msgstr "Instalando %s versión %s ye rechazao."
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "Baxando %s a versión %s ye rechazao."
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, c-format
msgid "Upgrading %s to version %s is rejected."
msgstr "Actualizando %s a versión %s ye rechazao."
-#: src/gtk/resolver.cc:386
+#: src/gtk/resolver.cc:426
#, c-format
msgid "Removing %s is preferred over all un-accepted alternatives."
msgstr "Desaniciando %s ye lo meyor sobre toles alternatives nun aceutaes."
-#: src/gtk/resolver.cc:391
+#: src/gtk/resolver.cc:431
#, c-format
msgid ""
"Canceling the installation of %s is preferred over all un-accepted "
@@ -4489,7 +4406,7 @@ msgstr ""
"Encaboxando la instalación de %s ye lo meyor sobre toles alternatives nun "
"aceutaes."
-#: 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."
@@ -4497,7 +4414,7 @@ msgstr ""
"Encaboxar el desaniciáu de %s ye lo meyor sobre toles alternatives nun "
"aceutaes."
-#: 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."
@@ -4505,51 +4422,51 @@ msgstr ""
"Caltener %s na so versión %s ye lo meyor sobre toles alternatives nun "
"aceutaes."
-#: 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 ""
"Instalar %s versión %s ye lo meyor sobre toles alternatives nun aceutaes."
-#: 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 ""
"Baxar %s de versión %s ye lo meyor sobre toles alternatives nun aceutaes."
-#: 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 ""
"Actualizar %s a versión %s ye lo meyor sobre toles alternatives nun aceutaes."
-#: src/gtk/resolver.cc:441
+#: src/gtk/resolver.cc:481
#, c-format
msgid "Leaving %ls unresolved is rejected."
msgstr "Dexar %ls nun resueltes ye rechazao."
-#: src/gtk/resolver.cc:447
+#: src/gtk/resolver.cc:487
#, c-format
msgid "Leaving %ls unresolved is preferred over all un-accepted alternatives."
msgstr ""
"Dexar %ls nun resueltes ye lo meyor sobre toles alternatives nun aceutaes."
-#: 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] "Cómo tratar la aición seleicionada"
msgstr[1] "Cómo tratar les aiciones seleicionaes"
-#: 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] "Ignorar soluciones que tengan esta aición."
msgstr[1] "Ignorar soluciones que tengan estes aiciones."
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4563,7 +4480,7 @@ msgstr[1] ""
"Permitir soluciones que tengan estes aiciones, pero non preferentemente "
"sobre otres soluciones."
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4573,234 +4490,246 @@ msgstr[0] ""
msgstr[1] ""
"Preferir siempre estes aiciones sobre alternatives que nun fueren aceptaes."
-#: 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 depende de %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 tien dependencies previes de %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 suxer %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 encamienta %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 tien conflictos con %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 fraya %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 camuda %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 fae obsoletu a %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 "Desaniciar los siguientes paquetes:"
-#: 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 "Instalar los siguientes paquetes:"
-#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781
+#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848
msgid "Keep the following packages:"
msgstr "Caltener los siguientes paquetes:"
-#: 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 "Anovar los paquetes siguientes:"
-#: 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 "Baxar de versión los siguientes paquetes:"
-#: src/gtk/resolver.cc:1369 src/gtk/resolver.cc:1819
+#: src/gtk/resolver.cc:1425 src/gtk/resolver.cc:1886
msgid "Leave the following dependencies unresolved:"
msgstr "Dexar les siguientes dependencies ensin resolver:"
-#: src/gtk/resolver.cc:1444
+#: src/gtk/resolver.cc:1502
#, c-format
msgid "Remove %s [<big>%s</big> (%s)]"
msgstr "Desaniciar %s [<big>%s</big> (%s)]"
-#: src/gtk/resolver.cc:1451
+#: src/gtk/resolver.cc:1509
#, c-format
msgid "Install %s [<big>%s</big> (%s)]"
msgstr "Instalar %s [<big>%s</big> (%s)]"
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, c-format
msgid "Cancel the installation of %s"
msgstr "Encaboxar la instalación de %s"
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, c-format
msgid "Cancel the removal of %s"
msgstr "Encaboxar el desaniciu de %s"
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, c-format
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr "Calterner %s na versión <big>%s</big> (%s)"
-#: src/gtk/resolver.cc:1472
+#: src/gtk/resolver.cc:1530
#, c-format
msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr "Actualizar %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
-#: src/gtk/resolver.cc:1481
+#: src/gtk/resolver.cc:1539
#, c-format
msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr "Baxar %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>Remove</b> %s"
msgstr "<b>Desaniciar</b> %s"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>remove</b> %s"
msgstr "<b>desaniciar</b> %s"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, c-format
msgid "<b>Keep</b> %s at version %s"
msgstr "<b>Caltener</b> %s na versión %s"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, c-format
msgid "<b>keep</b> %s at version %s"
msgstr "<b>caltener</b> %s na versión %s"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %s"
+msgid "<b>Cancel</b> the installation of %s"
+msgstr "Encaboxar la instalación de %s"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %s"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Encaboxar la instalación de %s"
+
+#: src/gtk/resolver.cc:1622
#, c-format
msgid "<b>Install</b> %s %s"
msgstr "<b>Instalar</b> %s %s"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1622
#, c-format
msgid "<b>install</b> %s %s"
msgstr "<b>instalar</b> %s %s"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "<b>Baxar</b> %s a versión %s"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "<b>baxar</b> %s a versión %s"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>Upgrade</b> %s to version %s"
msgstr "<b>Actualizar</b> %s a versión %s"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>upgrade</b> %s to version %s"
msgstr "<b>actualizar</b> %s a versión %s"
-#: src/gtk/resolver.cc:1586
+#: src/gtk/resolver.cc:1653
#, c-format
msgid "Leave %s unresolved"
msgstr "Dexar %s ensín resolver"
-#: src/gtk/resolver.cc:1586
+#: src/gtk/resolver.cc:1653
#, c-format
msgid "leave %s unresolved"
msgstr "dexar %s ensín resolver"
-#: src/gtk/resolver.cc:1654
+#: src/gtk/resolver.cc:1721
#, c-format
msgid "%s install"
msgid_plural "%s installs"
msgstr[0] "%s instalación"
msgstr[1] "%s instalaciones"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, c-format
msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "%s desaniciación"
msgstr[1] "%s desaniciaciones"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, c-format
msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "%s calteniu"
msgstr[1] "%s calteníos"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, c-format
msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "%s actualización"
msgstr[1] "%s actualizaciones"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, c-format
msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "%s baxada"
msgstr[1] "%s baxaes"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, c-format
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "%s recomendación non resuelta"
msgstr[1] "%s recomendaciones non resueltes"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
msgid "No solutions yet."
msgstr "Nun hai más soluciones."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
msgid "No dependency solution was found."
msgstr "Nun s'alcontraron soluciones de dependencia."
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
msgid "No solutions."
msgstr "Nun hai soluciones."
-#: src/gtk/resolver.cc:1994
+#: src/gtk/resolver.cc:2061
msgid "To view a solution, select it from the list to the right."
msgstr "Pa ver una solución, seleicionala dende la llista de la mandrecha."
-#: src/gtk/resolver.cc:1995
+#: src/gtk/resolver.cc:2062
#, c-format
msgid "%u solutions."
msgstr "%u soluciones."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr "Solución %s de %s (nivel: %s)."
@@ -7624,6 +7553,75 @@ msgstr "Baxando Rexistru de cambeos"
msgid "Download Changelog"
msgstr "Baxar Rexistru de cambeos"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "_Instalar/desaniciar paquetes"
+
+#~ msgid "_Update Package List"
+#~ msgstr "_Anovar llista de paquetes"
+
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Marcar _anovable"
+
+#~ msgid "_Forget New Packages"
+#~ msgstr "_Escaecer Paquetes Nuevos"
+
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Enc_aboxar Aiciones Pendientes"
+
+#~ msgid "C_lean Package Cache"
+#~ msgstr "_Llimpiar la Caché de Paquetes"
+
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Llimpiar ficheros _obsoletos"
+
+#~ msgid "_Reload Package Cache"
+#~ msgstr "_Recargar Caché de Paquetes"
+
+#~ msgid "_Play Minesweeper"
+#~ msgstr "_Xugar al Guetamines"
+
+#~ msgid "_Become Root"
+#~ msgstr "_Convertise n'Alministrador"
+
+#~ msgid "_Quit"
+#~ msgstr "_Colar"
+
+#~ msgid "gtk-undo"
+#~ msgstr "gtk-desfacer"
+
+#~ msgid "gtk-cut"
+#~ msgstr "gtk-cortar"
+
+#~ msgid "gtk-copy"
+#~ msgstr "gtk-copiar"
+
+#~ msgid "gtk-paste"
+#~ msgstr "gtk-apegar"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "_Edit Columns..."
+#~ msgstr "_Editar Columnes..."
+
+#~ msgid "View Apt _Errors"
+#~ msgstr "Ver _Fallos de Apt"
+
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Atopar _Cadenes de Dependencies"
+
+#~ msgid "gtk-go-back"
+#~ msgstr "gtk-dir-atrás"
+
+#~ msgid "gtk-go-forward"
+#~ msgstr "gtk-dir-alantre"
+
+#~ msgid "gtk-about"
+#~ msgstr "gtk-about"
+
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "Amosar una esplicación de la solución"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(pa %s)"
diff --git a/po/bs.po b/po/bs.po
index f9a211bb..3269a0e8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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: 2004-05-08 17:40+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -522,8 +522,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr ""
-#: 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 ""
@@ -1503,7 +1503,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 ""
@@ -1601,7 +1601,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr ""
#: 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 ""
@@ -1736,8 +1736,8 @@ msgstr "Automatski nadogradi instalirane pakete"
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 "Verzija:"
@@ -1816,12 +1816,12 @@ msgid "Obsoletes"
msgstr "Zastarijeva"
#: 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 ""
@@ -1975,8 +1975,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
#, fuzzy
msgid "Install"
msgstr "Automatski nadogradi instalirane pakete"
@@ -2113,7 +2112,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 ""
@@ -2376,49 +2375,49 @@ 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 "Sekcija:"
-#: src/generic/apt/aptitude_resolver_universe.cc:872
+#: src/generic/apt/aptitude_resolver_universe.cc:879
msgid "Cancel all user actions"
msgstr ""
-#: src/generic/apt/aptitude_resolver_universe.cc:873
+#: src/generic/apt/aptitude_resolver_universe.cc:880
#, fuzzy
msgid "Remove packages"
msgstr "Paket:"
-#: src/generic/apt/aptitude_resolver_universe.cc:874
+#: src/generic/apt/aptitude_resolver_universe.cc:881
#, fuzzy
msgid "Modify held packages"
msgstr "Paket:"
-#: 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 essential packages"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: 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 "
@@ -2848,310 +2847,215 @@ msgstr ""
msgid "_File"
msgstr ""
-#: 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"
-msgstr "Slijedeći paketi su OŠTEĆENI:"
-
-#: 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"
-msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
-
-#: 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
-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"
-msgstr "Paket:"
-
-#: 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
-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
-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"
-msgstr "Zastarijeva"
-
-#: 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
-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
-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"
msgstr ""
-#: src/gtk/aptitude.glade:180
-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
-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
-msgid "gtk-delete"
-msgstr ""
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package: "
msgid "_Package"
msgstr "Paket:"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
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
-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
-msgid "gtk-close"
-msgstr ""
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
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
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 "Install/Remove"
msgstr "Automatski nadogradi instalirane pakete"
-#: 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
-msgid "Purge"
-msgstr ""
-
-#: 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 "Make this the default for new package lists."
msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
-#: src/gtk/aptitude.glade:747
+#: src/gtk/aptitude.glade:646
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
+msgid "gtk-close"
+msgstr ""
+
+#: src/gtk/aptitude.glade:719 src/gtk/aptitude.glade:1425
+#: src/gtk/aptitude.glade:1754 src/gtk/aptitude.glade:1892
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
msgid "Incremental"
msgstr ""
-#: 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
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 "Depends"
msgid "Dependencies"
msgstr "Zavisi"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
msgid "Changelog"
msgstr "Poništi"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
msgid "Files"
msgstr ""
-#: 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
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
+msgid "Status"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1216
+msgid "Group by action type"
+msgstr ""
+
+#: 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 "
@@ -3160,128 +3064,115 @@ msgid ""
"This is the default view mode."
msgstr ""
-#: src/gtk/aptitude.glade:1232
-msgid "Group by action type"
+#: 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
msgid "Rejected"
msgstr ""
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
msgid "No preference"
msgstr "Unaprijed zavisi"
-#: 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
-msgid "Status"
-msgstr ""
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
msgstr ""
-#: src/gtk/aptitude.glade:1442
+#: src/gtk/aptitude.glade:1373
msgid "Calculate the next solution that has not yet been generated."
msgstr ""
-#: src/gtk/aptitude.glade:1443
-msgid "Find a new solution"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
msgstr ""
-#: src/gtk/aptitude.glade:1457
+#: src/gtk/aptitude.glade:1388
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
msgid "Upgrade Summary"
msgstr ""
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
msgid "Selected Package"
msgstr "Paket:"
-#: 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
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
msgid "gtk-yes"
msgstr ""
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3332,37 +3223,37 @@ msgstr "Preuzimam Changelog datoteku"
msgid "Downloading changelogs"
msgstr "Preuzimam Changelog datoteku"
-#: 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 koji će se koristiti za preuzimanje changelog datoteka"
-#: src/gtk/dashboardtab.cc:396
+#: src/gtk/dashboardtab.cc:397
msgid "Available upgrades:"
msgstr ""
-#: src/gtk/dashboardtab.cc:413
+#: src/gtk/dashboardtab.cc:414
#, c-format
msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
msgid "No upgrades are available."
msgstr "Automatski nadogradi instalirane pakete"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
msgid "Unable to calculate an upgrade."
msgstr ""
-#: 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 "
@@ -3373,7 +3264,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3384,42 +3275,42 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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
#, c-format
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
msgid "Find dependency chains: start"
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
msgid "Find dependency chains: end"
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
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
msgid "No dependency chain found."
msgstr ""
@@ -3645,6 +3536,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 ""
@@ -3814,6 +3709,18 @@ msgstr "Automatski nadogradi instalirane pakete"
msgid "Install/Upgrade"
msgstr "Automatski nadogradi instalirane pakete"
+#: src/gtk/gui.cc:1377
+msgid "Purge"
+msgstr ""
+
+#: 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 ""
@@ -3868,116 +3775,116 @@ 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 \"%s\"."
msgstr "Automatski prikazuj zašto su paketi oštećeni"
-#: 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 "Paket:"
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
msgid "Upgrade to %s version %s"
msgstr "Verzija:"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
msgid "Install %s version %s"
msgstr "Verzija:"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, c-format
msgid "Downgrade to %s version %s"
msgstr ""
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, fuzzy, c-format
msgid "Don't hold %s at its current version."
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: 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
#, c-format
msgid "Cancel any actions on %s."
msgstr ""
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, c-format
msgid "Cancel the purge of %s."
msgstr ""
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, c-format
msgid "Cancel the removal of %s."
msgstr ""
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, c-format
msgid "Cancel the upgrade of %s."
msgstr ""
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, c-format
msgid "Cancel the installation of %s."
msgstr ""
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, c-format
msgid "Cancel the downgrade of %s."
msgstr ""
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, c-format
msgid "Cancel the reinstallation of %s."
msgstr ""
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, c-format
msgid "Remove %s"
msgstr ""
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, c-format
msgid "Purge %s"
msgstr ""
-#: 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 "Mark %s as automatically installed."
msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
-#: src/gtk/packagestab.cc:643
+#: src/gtk/packagestab.cc:646
#, c-format
msgid "%s is a virtual package provided by:\n"
msgstr ""
-#: 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
msgid "Source: "
msgstr ""
@@ -4001,24 +3908,24 @@ msgstr "Instal·la automàticament els paquets suggerits"
msgid "%s is being installed manually."
msgstr "Instal·la automàticament els paquets suggerits"
-#: 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
msgid "Searching..."
msgstr ""
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
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 "
@@ -4028,7 +3935,7 @@ msgid ""
"either on your system or in the Debian archive."
msgstr ""
-#: 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 "
@@ -4036,74 +3943,74 @@ msgid ""
"package declaring an 'important' dependency on them.\n"
msgstr ""
-#: 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 "
"state to avoid breaking dependencies."
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 "
"package you have chosen for installation."
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 "
"is no longer available, or because another package conflicts with them."
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 "
"installed."
msgstr ""
-#: 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 "
"their current version."
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."
msgstr ""
-#: 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 "
"computer."
msgstr ""
-#: 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."
msgstr ""
-#: 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."
msgstr ""
-#: 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 "
"made to complete their installation."
msgstr ""
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
msgid "Preview: "
msgstr ""
@@ -4121,111 +4028,117 @@ 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 "Paket:"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
#, fuzzy
msgid "Not Installed"
msgstr "Automatski nadogradi instalirane pakete"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, c-format
msgid "Removing %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:337
+#: src/gtk/resolver.cc:377
#, c-format
msgid "Canceling the installation of %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, c-format
msgid "Canceling the removal of %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, fuzzy, c-format
msgid "Keeping %s at version %s is rejected."
msgstr "Verzija:"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
msgid "Installing %s version %s is rejected."
msgstr "Verzija:"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, fuzzy, c-format
msgid "Upgrading %s to version %s is rejected."
msgstr "Verzija:"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4235,7 +4148,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4243,241 +4156,251 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1172 src/solution_fragment.cc:108
+#: src/gtk/resolver.cc:1226 src/solution_fragment.cc:108
#, fuzzy, c-format
msgid "%s depends upon %s"
msgstr "Preporučuje"
-#: src/gtk/resolver.cc:1175 src/solution_fragment.cc:111
+#: src/gtk/resolver.cc:1229 src/solution_fragment.cc:111
#, fuzzy, c-format
msgid "%s pre-depends upon %s"
msgstr "Preporučuje"
-#: src/gtk/resolver.cc:1178 src/solution_fragment.cc:114
+#: src/gtk/resolver.cc:1232 src/solution_fragment.cc:114
#, fuzzy, c-format
msgid "%s suggests %s"
msgstr "Predlaže"
-#: 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
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "Preporučuje"
-#: 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 ""
-#: src/gtk/resolver.cc:1187 src/solution_fragment.cc:123
+#: src/gtk/resolver.cc:1241 src/solution_fragment.cc:123
#, fuzzy, c-format
msgid "%s breaks %s"
msgstr "Zamjenjuje"
-#: src/gtk/resolver.cc:1190 src/solution_fragment.cc:126
+#: src/gtk/resolver.cc:1244 src/solution_fragment.cc:126
#, fuzzy, c-format
msgid "%s replaces %s"
msgstr "Zamjenjuje"
-#: src/gtk/resolver.cc:1193 src/solution_fragment.cc:129
+#: src/gtk/resolver.cc:1247 src/solution_fragment.cc:129
#, fuzzy, c-format
msgid "%s obsoletes %s"
msgstr "Zastarijeva"
-#: 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
#, fuzzy
msgid "Remove the following packages:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: 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
#, fuzzy
msgid "Install the following packages:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781
+#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848
#, fuzzy
msgid "Keep the following packages:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: 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
#, fuzzy
msgid "Upgrade the following packages:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: 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
#, fuzzy
msgid "Downgrade the following packages:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: 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:"
msgstr "Slijedeći paketi su OŠTEĆENI:"
-#: src/gtk/resolver.cc:1444
+#: src/gtk/resolver.cc:1502
#, c-format
msgid "Remove %s [<big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1451
+#: src/gtk/resolver.cc:1509
#, fuzzy, c-format
msgid "Install %s [<big>%s</big> (%s)]"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, c-format
msgid "Cancel the installation of %s"
msgstr ""
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, c-format
msgid "Cancel the removal of %s"
msgstr ""
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, fuzzy, c-format
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1472
+#: src/gtk/resolver.cc:1530
#, c-format
msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1481
+#: src/gtk/resolver.cc:1539
#, c-format
msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>Remove</b> %s"
msgstr ""
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>remove</b> %s"
msgstr ""
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
msgid "<b>Keep</b> %s at version %s"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
msgid "<b>keep</b> %s at version %s"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, c-format
+msgid "<b>Cancel</b> the installation of %s"
+msgstr ""
+
+#: src/gtk/resolver.cc:1615
+#, c-format
+msgid "<b>cancel</b> the installation of %s"
+msgstr ""
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
msgid "<b>Install</b> %s %s"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
msgid "<b>install</b> %s %s"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, fuzzy, c-format
msgid "<b>Upgrade</b> %s to version %s"
msgstr "Verzija:"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, fuzzy, c-format
msgid "<b>upgrade</b> %s to version %s"
msgstr "Verzija:"
-#: 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 "%s install"
msgid_plural "%s installs"
msgstr[0] "Automatski nadogradi instalirane pakete"
msgstr[1] "Automatski nadogradi instalirane pakete"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "Automatski prikazuj zašto su paketi oštećeni"
msgstr[1] "Automatski prikazuj zašto su paketi oštećeni"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, c-format
msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, c-format
msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, c-format
msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "Preporučuje"
msgstr[1] "Preporučuje"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
msgid "No solutions yet."
msgstr ""
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
msgid "No dependency solution was found."
msgstr ""
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
msgid "No solutions."
msgstr "Opcije"
-#: 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 "%u solutions."
msgstr "Opcije"
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7127,6 +7050,23 @@ msgid "Download Changelog"
msgstr "Preuzimam Changelog datoteku"
#, fuzzy
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#, fuzzy
+#~ msgid "_Update Package List"
+#~ msgstr ""
+#~ "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
+
+#, fuzzy
+#~ msgid "_Forget New Packages"
+#~ msgstr "Paket:"
+
+#, fuzzy
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Zastarijeva"
+
+#, fuzzy
#~ msgid "Nothing to do: there are no broken packages."
#~ msgstr "Paket:"
diff --git a/po/ca.po b/po/ca.po
index 4a2f69c3..8d813311 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.11.9\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-09-19 00:45+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -536,8 +536,8 @@ msgstr "S'ha produït un error fatal al sistema de resolució"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] S'estan resolent les dependències"
-#: 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 "S'ha produït un error intern: solució nul·la no esperada."
@@ -1597,7 +1597,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "S'estan resolent les dependències..."
@@ -1700,7 +1700,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "No s'han trobat les dependències del paquets següents:\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>"
@@ -1836,8 +1836,8 @@ msgstr "Instal·lat automàticament"
msgid "no"
msgstr "no"
-#: 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 "Versió: "
@@ -1916,12 +1916,12 @@ msgid "Obsoletes"
msgstr "Obsolet"
#: 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 "Proporciona"
#: 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 "Descripció: "
@@ -2076,8 +2076,7 @@ msgstr "Actual"
msgid "Candidate"
msgstr "Candidat"
-#: 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 "Instal·la"
@@ -2217,7 +2216,7 @@ msgstr "No satisfetes"
msgid "UNAVAILABLE"
msgstr "No disponible"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Marcadors"
@@ -2493,54 +2492,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 "Secció"
-#: 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 "Canc^el·la pes accions pendents"
-#: 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 "'-' per suprimir els paquets"
-#: 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 "no és un paquet real"
-#: 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 "Suprimeix els següents paquets:"
-#: 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 "
@@ -3002,101 +3001,47 @@ msgstr ""
msgid "_File"
msgstr "Fals"
-#: 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 "Realitza totes les instal·lacions i supressions pendents"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Instal·la/suprimeix els paquets"
-
-#: 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 "Verifica si hi ha noves versions dels paquets"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "Act^ualitza la llista de paquets"
-
-#: 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 ""
"Marca tots els paquets actualitzables que no estiguin retinguts per a "
"l'actualització"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Marca com a ^actualitzable"
-
-#: 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 "Oblida quins paquets són \"nous\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Oblida els paquets nous"
-
-#: 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 ""
"Cancel·la totes les instal·lacions, supressions, retencions i "
"actualitzacions pendents."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Canc^el·la pes accions pendents"
-
-#: 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 "Suprimeix els fitxers dels paquets prèviament baixats"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Neteja la memòria ^cau dels paquets"
-
-#: 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 "Suprimeix els fitxers dels paquets que no es podran tornar a baixar"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Neteja els fitxers ^obsolets"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Torna a carregar la memòria cau dels paquets"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Recarrega la memòria cau dels paquets"
-
-#: 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 "Perdeu el temps intentant trobar les mines"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Juga al busca mines"
-
-#: 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"
@@ -3104,261 +3049,200 @@ msgstr ""
"Executeu l'ordre 'su' per ser superusuari; es reiniciarà el programa, però "
"es mantindran els paràmetres personals."
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Esdevé superusuari"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Surt del programa"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "Su^rt"
-
-#: 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 "Desfés l'última operació o grup d'operacions del paquets"
-#: 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 "suprimeix"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paquet"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Vistes"
-#: 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 "Gestió de les dependències"
-
-#: 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 "suprimeix"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Ajuda"
-#: 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 "Actualitza la llista"
-#: 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 "Paquets"
-#: 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 "Previsualització"
-#: 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 "Sistema de resolució"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Instal·lat"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Suprimeix"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Purga"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Mantín"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Retín"
-
-#: 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 "Suprimeix el filtre de la llista de paquets"
-#: 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 "Aplica un filtre a la llista de paquets"
-#: 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 "suprimeix"
+
+#: 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 "Cerca"
-#: 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 "reinstal·la"
-#: 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 "Err "
-#: 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 "Dependències de %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "Registre de modifi^cacions"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Fals"
-#: 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 "Marcadors"
-#: 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 "Estat"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "El tipus d'acció és desconegut: %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 "
@@ -3367,150 +3251,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 "El tipus d'acció és desconegut: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "visualitza una explicació de les modificacions de la solució"
-
-#: 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 "Commuta ^rebutjat"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Preferències"
-#: 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 "Estat"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Examina la solució"
-#: 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 "Selecciona la següent solució dels problemes de dependències."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Examina la solució"
+#: 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 "Executa les accions definides en la solució seleccionada."
-#: 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 "Actualitza"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Font del paquet: "
-#: 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 "Manual"
-#: 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 "Actualitza"
-#: 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 "sí"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3567,21 +3432,21 @@ msgstr "S'està baixant el registre de canvis"
msgid "Downloading changelogs"
msgstr "S'està baixant el registre de canvis"
-#: 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 a utilitzar per baixar els registres de canvis"
-#: 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"
@@ -3590,19 +3455,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d actualitzat"
msgstr[1] "%d actualitzats"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "No instal·lat"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "No s'ha pogut ubicar el paquet %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 "
@@ -3613,7 +3478,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3624,14 +3489,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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"
@@ -3639,36 +3504,36 @@ msgstr ""
"S'ha produït un error intern: la cadena predeterminada de la columna no es "
"pot analitzar"
-#: 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 "Gestió de les dependències"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Gestió de les dependències"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Gestió de les dependències"
-#: 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."
@@ -3931,6 +3796,10 @@ msgstr "Reinstal·la"
msgid "Downgrade"
msgstr "Desactualitza"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Suprimeix"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4125,6 +3994,20 @@ msgstr "no instal·lat"
msgid "Install/Upgrade"
msgstr "Instal·lat"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Purga"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Mantín"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Retín"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4190,132 +4073,132 @@ msgstr "no"
msgid "Unknown"
msgstr "Desconegut"
-#: 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 "No hi ha cap paquet que coincideixi amb el patró \"%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 "Paquet: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s versions"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Instal·la(%s proveeix %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 " Versió de les 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 "Mantín la versió actual dels següents paquets:"
-#: 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 "Canc^el·la pes accions pendents"
-#: 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 "Cancel·la la supressió de %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 "Cancel·la la supressió de %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 "Cancel·la la supressió de %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 "Cancel·la la instal·lació de %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 "Cancel·la la supressió de %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 "Cancel·la la instal·lació de %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Suprimeix(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Purga"
-#: 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' per marcar els paquets com a instal·lats automàticament"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr "'&m' marca els paquets com a instal·lats manualment"
-#: 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\" és un paquet virtual proporcionat per:\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: "
@@ -4345,28 +4228,28 @@ msgstr "%s; s'instal·larà automàticament"
msgid "%s is being installed manually."
msgstr "%s; s'instal·larà automàticament"
-#: 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 "Cerca"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "S'està construïnt la vista"
-#: 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 "S'està construïnt la vista"
-#: 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 "
@@ -4382,7 +4265,7 @@ msgstr ""
" La presència d'aquest arbre indica, molt probablement, que hi ha algun "
"error en el vostre sistema o en l'arxiu de 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 "
@@ -4395,7 +4278,7 @@ msgstr ""
"per resoldre dependències, i després d'aplicar les accions programades no hi "
"haurà cap paquet instal·lat que en depengui.\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 "
@@ -4405,7 +4288,7 @@ msgstr ""
" Aquests paquets es podrien actualitzar, però s'han retingut en el seu estat "
"actual per evitar provocar errors amb les dependències."
-#: 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 "
@@ -4415,7 +4298,7 @@ msgstr ""
" Aquests paquets s'instal·len per arran de la necessitats d'un altre paquet "
"a instal·lar."
-#: 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 "
@@ -4425,7 +4308,7 @@ msgstr ""
" Aquests paquets se suprimeixen arran de la impossibilitat de resoldre una o "
"diverses dependències, o perquè un altre paquet hi entra en conflicte."
-#: 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 "
@@ -4434,7 +4317,7 @@ msgstr ""
"Paquets a desactualitzar\n"
" S'instal·la una versió més vella dels paquets actuals."
-#: 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 "
@@ -4444,7 +4327,7 @@ msgstr ""
" Aquests paquets es podrien actualitzar, però heu demanat retenir-los a la "
"versió actual."
-#: 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."
@@ -4452,7 +4335,7 @@ msgstr ""
"Paquets a reinstal·lar\n"
" Aquests paquets es reinstal·laran"
-#: 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 "
@@ -4461,7 +4344,7 @@ msgstr ""
"Paquets a instal·lar\n"
" Aquests paquets s'han seleccionat manualment per a la instal·lació"
-#: 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."
@@ -4469,7 +4352,7 @@ msgstr ""
"Paquets a suprimir\n"
" Aquests paquets s'han seleccionat manualment per a la supressió."
-#: 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."
@@ -4477,7 +4360,7 @@ msgstr ""
"Paquets a actualitzar\n"
" Aquests paquets s'actualitzaran a una nova versió."
-#: 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 "
@@ -4487,7 +4370,7 @@ msgstr ""
" Aquests paquets no s'han instal·lat i configurat completament, es farà un "
"intent per a completar la seua instal·lació."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4508,117 +4391,123 @@ 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 "Paquet"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "No instal·lat"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "S'està suprimint %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 "Cancel·la la instal·lació de %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 "Cancel·la la supressió de %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 "Mantín %F a la versió %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 "Instal·la(%s proveeix %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 " Versió de les 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 versions"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4628,7 +4517,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4636,192 +4525,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 depèn de %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 pre-depèn de %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 suggereix %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 recomana %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 entra en conflicte amb %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 trenca %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 substitueix %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 deixa obsolet %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 "Suprimeix els següents paquets:"
-#: 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 "Instal·la els següents paquets:"
-#: 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 "Suprimeix els següents paquets:"
-#: 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 "Actualitza els següents paquets:"
-#: 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 "Desactualitza els següents paquets:"
-#: 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 "Deixa les dependències següents pendents de resolució:%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 "Suprimeix %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 "Instal·la %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 "Cancel·la la instal·lació de %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 "Cancel·la la supressió de %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 "Mantín %F a la versió %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 "Actualitza %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 "Desactualitza %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 "Suprimeix(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Suprimeix(%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 "Mantín %F a la versió %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 "Mantín %F a la versió %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 "Cancel·la la instal·lació de %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Cancel·la la instal·lació de %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Instal·la %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 "Instal·la %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 " Versió de les 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 " Versió de les 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 versions"
-#: 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 versions"
-#: 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"
@@ -4830,7 +4731,7 @@ msgid_plural "%s installs"
msgstr[0] "%d instal·lació"
msgstr[1] "%d instal·lacions"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4839,7 +4740,7 @@ msgid_plural "%s removes"
msgstr[0] "%d supressió"
msgstr[1] "%d supressions"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4848,7 +4749,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d mantingut"
msgstr[1] "%d mantinguts"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4857,7 +4758,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d actualitzat"
msgstr[1] "%d actualitzats"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4866,7 +4767,7 @@ msgid_plural "%s downgrades"
msgstr[0] "$d desactualitzat"
msgstr[1] "%d desactualitzats"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4874,35 +4775,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Audita les ^recomanacions"
msgstr[1] "Audita les ^recomanacions"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "No hi ha més solucions."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Gestió de les dependències"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "No hi ha més solucions."
-#: 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 "No hi ha més solucions."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7751,6 +7652,76 @@ msgstr "S'està baixant el registre de canvis"
msgid "Download Changelog"
msgstr "Descarrega el registre de canvis"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Instal·la/suprimeix els paquets"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "Act^ualitza la llista de paquets"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Marca com a ^actualitzable"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Oblida els paquets nous"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Canc^el·la pes accions pendents"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Neteja la memòria ^cau dels paquets"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Neteja els fitxers ^obsolets"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Recarrega la memòria cau dels paquets"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Juga al busca mines"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Esdevé superusuari"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "Su^rt"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "suprimeix"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Gestió de les dependències"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "visualitza una explicació de les modificacions de la solució"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(per a %s)"
diff --git a/po/cs.po b/po/cs.po
index 958d0c24..baa77653 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-08-31 10:49+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -631,8 +631,8 @@ msgstr "Fatální chyba v řešiteli"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Řeším závislosti"
-#: 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 "Vnitřní chyba: neočekávané prázdné řešení."
@@ -1689,7 +1689,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
msgstr "Chci řešit závislosti, ale žádný řešitel závislostí nebyl vytvořen."
#: 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 "Řeším závislosti..."
@@ -1791,7 +1791,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Následující balíky mají nesplněné závislosti:\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>"
@@ -1927,8 +1927,8 @@ msgstr "Automaticky instalovaný"
msgid "no"
msgstr "ne"
-#: 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 "Verze: "
@@ -2007,12 +2007,12 @@ msgid "Obsoletes"
msgstr "Zastarává"
#: 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 "Poskytuje"
#: 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 "Popis: "
@@ -2170,8 +2170,7 @@ msgstr "Aktuální"
msgid "Candidate"
msgstr "Kandidát"
-#: 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 "Instalovat"
@@ -2310,7 +2309,7 @@ msgstr "NESPLNĚNO"
msgid "UNAVAILABLE"
msgstr "NEDOSTUPNÝ"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Značky"
@@ -2578,54 +2577,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 "Sekce"
-#: 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 "Zrušit naplánované akc^e"
-#: 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 "„-“ pro odstranění balíků"
-#: 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 "není skutečný balík"
-#: 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 "Odstranit následující balíky:"
-#: 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 "
@@ -3080,98 +3079,44 @@ msgstr ""
msgid "_File"
msgstr "Zakázáno"
-#: 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 "Provede všechny nevyřízené instalace a odstraňování"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Instalovat/odstranit balíky"
-
-#: 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 "Zjistí, zda nejsou k dispozici novější verze balíků"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Aktualizovat seznam balíků"
-
-#: 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 "Označí všechny aktualizovatelné balíky, které nejsou podrženy"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Označit aktualizovatelné"
-
-#: 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 "Zapomene, které balíky jsou „nové“"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Zapomenout nové balíky"
-
-#: 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 ""
"Zruší všechny naplánované instalace, odstranění, podržení a aktualizace."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Zrušit naplánované akc^e"
-
-#: 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 "Smaže stažené soubory (balíky) z /var/cache/apt"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Vyčistit ^cache s balíky"
-
-#: 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 "Smaže soubory, které se již nedají stáhnout"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Vyčistit staré s^oubory"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Znovu načíst obsah cache"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "Znovu načíst cache"
-
-#: 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 "Ukrátit čas hledáním min."
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Zahrát si minové ^pole"
-
-#: 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"
@@ -3179,261 +3124,200 @@ msgstr ""
"Pro přepnutí na uživatele root spusťte „su“. Tím se program restartuje, ale "
"všechna nastavení budou zachována"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Stát se rootem"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Ukončí program"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "Konec"
-
-#: 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 "Vrátí zpět poslední operaci nebo skupinu operací s balíky"
-#: 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 "smazat"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Balík"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Pohledy"
-#: 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 "Správa závislostí"
-
-#: 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 "smazat"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Nápověda"
-#: 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 "Aktualizace seznamu"
-#: 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 "Balíky"
-#: 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 "Náhled"
-#: 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 "Řešitel"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Nainstalovaný"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Odstranit"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "Vyčistit"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Ponechat"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Podržet"
-
-#: 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 "Odstraní filtr aplikovaný na seznam balíků"
-#: 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 "Na seznam balíků aplikuje výběrový filtr"
-#: 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 "smazat"
+
+#: 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 "Hledat"
-#: 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 "reinstalovat"
-#: 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 "Err "
-#: 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 "Závislosti %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "Seznam změn"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Zakázáno"
-#: 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 "Značky"
-#: 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 "Stav"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Neznámá akce: %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 "
@@ -3442,148 +3326,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 "Neznámá akce: %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 "Přepnout zamítnutí"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Předvolby"
-#: 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 "Stav"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "Prozkoumat ř^ešení"
-#: 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 "Vybere další řešení závislostních problémů."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "Prozkoumat ř^ešení"
+#: 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 "Provede akce obsažené v aktuálně vybraném řešení."
-#: 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 "Aktualizovat"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Zdrojový balík: "
-#: 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 "Manuál"
-#: 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 "Aktualizovat"
-#: 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 "ano"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3636,21 +3503,21 @@ msgstr "Stahuji Changelog"
msgid "Downloading changelogs"
msgstr "Stahuji 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 pro stahování záznamů o změnách"
-#: 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"
@@ -3660,19 +3527,19 @@ msgstr[0] "%d aktualizace"
msgstr[1] "%d aktualizace"
msgstr[2] "%d aktualizací"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Nenainstalovaný"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Nemohu nalézt balík %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 "
@@ -3684,7 +3551,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'>"
@@ -3696,49 +3563,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 "Vnitřní chyba: Výchozí řetězec sloupce je nezpracovatelný"
-#: 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 "Správa závislostí"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Správa závislostí"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Správa závislostí"
-#: 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."
@@ -4003,6 +3870,10 @@ msgstr "Přeinstalovat"
msgid "Downgrade"
msgstr "Degradovat"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Odstranit"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4202,6 +4073,20 @@ msgstr "nenainstalovaný"
msgid "Install/Upgrade"
msgstr "Nainstalovaný"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "Vyčistit"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Ponechat"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Podržet"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4267,133 +4152,133 @@ msgstr "ne"
msgid "Unknown"
msgstr "Neznámé"
-#: 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 "Žádné balíky nevyhovují vzoru „%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 "Balík: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "verze %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 "Instalovat(%s poskytuje %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 verze: %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 "Ponechat následující balíky v jejich aktuální verzi:"
-#: 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 "Zrušit naplánované akc^e"
-#: 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 "Zrušení odstranění %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 "Zrušení odstranění %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 "Zrušení odstranění %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 "Zrušení instalace %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 "Zrušení odstranění %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 "Zrušení instalace %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Odstranit(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "Vyčistit"
-#: 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“ pro označení balíků jako instalované automaticky"
-#: 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 "Balík „%s“ byl nainstalován ručně.\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“ je virtuální balík poskytovaný:\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: "
@@ -4423,28 +4308,28 @@ msgstr "%s; bude instalován automaticky"
msgid "%s is being installed manually."
msgstr "%s; bude instalován automaticky"
-#: 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 "Hledat"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Sestavuji pohled"
-#: 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 "Sestavuji pohled"
-#: 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 "
@@ -4459,7 +4344,7 @@ msgstr ""
" Přítomnost tohoto stromu naznačuje, že je něco divného ve vašem systému "
"nebo v archivu Debianu."
-#: 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 "
@@ -4470,7 +4355,7 @@ msgstr ""
" Tyto balíky jsou označeny pro smazání, protože byly nainstalovány "
"automaticky kvůli závislostem, které již nejsou potřeba.\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 "
@@ -4480,7 +4365,7 @@ msgstr ""
" Tyto balíky mohou být aktualizovány na novější verzi, ale jsou podrženy ve "
"své stávající verzi, aby se neporušily závislosti."
-#: 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 "
@@ -4490,7 +4375,7 @@ msgstr ""
" Tyto balíky budou automaticky nainstalovány, protože jsou vyžadovány jinými "
"balíky, které jste vybrali pro instalaci."
-#: 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 "
@@ -4500,7 +4385,7 @@ msgstr ""
" Tyto balíky budou odstraněny, protože jedna nebo více jejich závislostí již "
"není splněna, nebo protože je s nimi jiný balík v konfliktu."
-#: 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 "
@@ -4509,7 +4394,7 @@ msgstr ""
"Balíky k degradaci\n"
" Tyto balíky budou nahrazeny svou starší verzí."
-#: 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 "
@@ -4519,7 +4404,7 @@ msgstr ""
" Tyto balíky mohou být aktualizovány na novější verzi, ale vy jste požádali "
"o jejich podržení ve stávající verzi."
-#: 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."
@@ -4527,7 +4412,7 @@ msgstr ""
"Balíky k reinstalaci\n"
" Tyto balíky budou přeinstalovány."
-#: 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 "
@@ -4536,7 +4421,7 @@ msgstr ""
"Balíky k instalaci\n"
" Tyto balíky jste vybrali pro instalaci na svůj počítač."
-#: 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."
@@ -4544,7 +4429,7 @@ msgstr ""
"Balíky k odstranění\n"
" Tyto balíky jste vybrali pro odstranění ze systému."
-#: 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."
@@ -4552,7 +4437,7 @@ msgstr ""
"Balíky k aktualizaci\n"
" Tyto balíky budou aktualizovány na novější verzi."
-#: 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 "
@@ -4562,7 +4447,7 @@ msgstr ""
" Tyto balíky nejsou plně nainstalovány a zkonfigurovány; aptitude se pokusí "
"dokončit jejich instalaci."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4583,119 +4468,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 "Balík"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Nenainstalovaný"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Odstraňuji %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 "Zrušení instalace %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 "Zrušení odstranění %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 "Ponechání %F ve verzi %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 "Instalovat(%s poskytuje %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 verze: %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 "verze %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."
@@ -4706,7 +4597,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 ""
@@ -4715,192 +4606,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 závisí na %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 předzávisí na %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 navrhuje %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 doporučuje %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 koliduje 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 porušuje %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 nahrazuje %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 zastarává %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 "Odstranit následující balíky:"
-#: 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 "Instalovat následující balíky:"
-#: 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 "Odstranit následující balíky:"
-#: 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 "Aktualizovat následující balíky:"
-#: 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 "Degradovat následující balíky:"
-#: 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 "Ponechat následující závislosti nevyřešené:%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 "Odstranění %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 "Instalace %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 "Zrušení instalace %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 "Zrušení odstranění %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 "Ponechání %F ve verzi %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 "Aktualizace %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 "Degradace %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 "Odstranit(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Odstranit(%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 "Ponechání %F ve verzi %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 "Ponechání %F ve verzi %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 "Zrušení instalace %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Zrušení instalace %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Instalace %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 "Instalace %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 verze: %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 verze: %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 "verze %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 "verze %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"
@@ -4910,7 +4813,7 @@ msgstr[0] "%d instalace"
msgstr[1] "%d instalace"
msgstr[2] "%d instalací"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4920,7 +4823,7 @@ msgstr[0] "%d odstranění"
msgstr[1] "%d odstranění"
msgstr[2] "%d odstranění"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4930,7 +4833,7 @@ msgstr[0] "%d ponechání"
msgstr[1] "%d ponechání"
msgstr[2] "%d ponechání"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4940,7 +4843,7 @@ msgstr[0] "%d aktualizace"
msgstr[1] "%d aktualizace"
msgstr[2] "%d aktualizací"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4950,7 +4853,7 @@ msgstr[0] "%d degradace"
msgstr[1] "%d degradace"
msgstr[2] "%d degradací"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4959,35 +4862,35 @@ msgstr[0] "Prověřit dopo^ručení"
msgstr[1] "Prověřit dopo^ručení"
msgstr[2] "Prověřit dopo^ručení"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Žádná další řešení."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Správa závislostí"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Žádná další řešení."
-#: 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 "Žádná další řešení."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7767,6 +7670,71 @@ msgstr "Stahuji Changelog"
msgid "Download Changelog"
msgstr "Stáhnout Changelog"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Instalovat/odstranit balíky"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Aktualizovat seznam balíků"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Označit aktualizovatelné"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Zapomenout nové balíky"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Zrušit naplánované akc^e"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Vyčistit ^cache s balíky"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Vyčistit staré s^oubory"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "Znovu načíst cache"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Zahrát si minové ^pole"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Stát se rootem"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "Konec"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "smazat"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Správa závislostí"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(pro %s)"
diff --git a/po/da.po b/po/da.po
index f218bd51..940b4479 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.11.2-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: 2009-01-21 10:01+0100\n"
"Last-Translator: Morten Bo Johansen <mbj@spamcop.net>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -660,8 +660,8 @@ msgstr "Kritisk fejl i afh�ngighedsudreder"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Udreder afh�ngigheder"
-#: 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 "Intern fejl: L�sning returnerede uventet nul."
@@ -1742,7 +1742,7 @@ msgstr ""
"afh�ngighedsudreder for disse."
#: 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 "Udreder afh�ngigheder ..."
@@ -1850,7 +1850,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "F�lgende pakker har uopfyldte afh�ngigheder:\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 "<NUL>"
@@ -1986,8 +1986,8 @@ msgstr "Automatisk installeret"
msgid "no"
msgstr "nej"
-#: 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 "Version: "
@@ -2066,12 +2066,12 @@ msgid "Obsoletes"
msgstr "For�lder"
#: 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 "Giver"
#: 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 "Beskrivelse: "
@@ -2225,8 +2225,7 @@ msgstr "Aktuel"
msgid "Candidate"
msgstr "Kandidat"
-#: 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 "Install�r"
@@ -2367,7 +2366,7 @@ msgstr "UOPFYLDT"
msgid "UNAVAILABLE"
msgstr "UTILG�NGELIG"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "M�rkater"
@@ -2639,54 +2638,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 "Afsnit"
-#: 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 "A^nnull�r afventende handlinger"
-#: 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 "'-' for at afinstallere pakker"
-#: 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 "ikke en rigtig pakke"
-#: 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 "Afinstall�r de f�lgende pakker:"
-#: 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 "
@@ -3145,99 +3144,45 @@ msgstr ""
msgid "_File"
msgstr "Falsk"
-#: 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 "Udf�r alle afventende installeringer og afinstalleringer"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Install�r/afinstall�r pakker"
-
-#: 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 "Se efter nye versioner af pakker"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "Opdat�r pakkeliste"
-
-#: 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 "Mark�r alle ikke-tilbageholdte pakker til opgradering"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Mark�r op^grad�rbare"
-
-#: 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 "Glem hvilke pakker der er \"nye\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Ryd liste over nye pakker"
-
-#: 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 ""
"Annull�r alle afventende installeringer, afinstalleringer, "
"tilbageholdelser og opgraderinger."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "A^nnull�r afventende handlinger"
-
-#: 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 "Slet tidligere hentede pakkefiler"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^T�m pakkecache"
-
-#: 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 "Slet pakkefiler som ikke l�ngere kan hentes"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Slet f^or�ldede filer"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Genindl�s pakkecachen"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Genindl�s pakkecache"
-
-#: 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 "Spild tid mens du pr�ver at finde miner"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Spil minestryger"
-
-#: 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"
@@ -3245,261 +3190,200 @@ msgstr ""
"K�r \"su\" for at blive root. Dette vil genstarte programmet, men dine "
"indstillinger vil blive bevaret"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Bliv root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Afslut programmet"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Afslut"
-
-#: 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 "Fortryd den sidste pakkehandling eller gruppe af handlinger"
-#: 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 "slet"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pakke"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Oversigter"
-#: 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 "H�ndtering af afh�ngigheder"
-
-#: 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 "slet"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Hj�lp"
-#: 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 "Opdatering af pakkeliste"
-#: 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 "Pakker"
-#: 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 "Forh�ndsvisning"
-#: 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 "Afh�ngighedsudreder"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Installeret"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Afinstall�r"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Udrens"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Behold"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Tilbagehold"
-
-#: 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 "Fjern filteret fra pakkelisten"
-#: 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 "Anvend et filter p� pakkelisten"
-#: 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 "slet"
+
+#: 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 "S�g"
-#: 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 "geninstall�r"
-#: 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 "Fejl "
-#: 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 "Afh�ngigheder for %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "�ndrings^log"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Falsk"
-#: 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 "M�rkater"
-#: 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 "Status"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Ukendt handlingstype: %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 "
@@ -3508,149 +3392,132 @@ 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 "Ukendt handlingstype: %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 "Skift af^vist"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Indstillinger"
-#: 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 "Status"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Gennemg� l�sning"
-#: 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 ""
"V�lg den n�ste l�sning p� problemerne med pakkeafh�ngigheder."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Gennemg� l�sning"
+#: 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 "Udf�r handlingerne i den aktuelt valgte l�sning."
-#: 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 "Opgrad�r"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Kildepakke: "
-#: 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 "Manuel"
-#: 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 "Opgrad�r"
-#: 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 "ja"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3703,21 +3570,21 @@ msgstr "Henter �ndringslog"
msgid "Downloading changelogs"
msgstr "Henter �ndringslog"
-#: 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 som �ndringslogs skal hentes fra"
-#: 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"
@@ -3726,19 +3593,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d til opgradering"
msgstr[1] "%d til opgradering"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Ikke installeret"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Kunne ikke finde pakke %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 "
@@ -3749,7 +3616,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3760,49 +3627,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Intern fejl: Standard kolonnestreng kan ikke fortolkes"
-#: 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 "H�ndtering af afh�ngigheder"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "H�ndtering af afh�ngigheder"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "H�ndtering af afh�ngigheder"
-#: 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."
@@ -4067,6 +3934,10 @@ msgstr "Geninstall�r"
msgid "Downgrade"
msgstr "Nedgrad�r"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Afinstall�r"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4263,6 +4134,20 @@ msgstr "ikke installeret"
msgid "Install/Upgrade"
msgstr "Installeret"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Udrens"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Behold"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Tilbagehold"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4328,133 +4213,133 @@ msgstr "nej"
msgid "Unknown"
msgstr "Ukendt"
-#: 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 "Ingen pakker passer med m�nstret \"%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 "Pakke: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s Versioner"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Install�r(%s giver %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 version: %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 "Behold de f�lgende pakker i deres nuv�rende version:"
-#: 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 "A^nnull�r afventende handlinger"
-#: 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 "Forkast afinstalleringen af %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 "Forkast afinstalleringen af %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 "Forkast afinstalleringen af %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 "Forkast installeringen af %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 "Forkast afinstalleringen af %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 "Forkast installeringen af %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Afinstall�r(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Udrens"
-#: 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' for at markere pakker som automatisk installerede"
-#: 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 "Pakken \"%s\" er manuelt installeret.\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\" er en virtuel pakke som gives af:\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: "
@@ -4484,28 +4369,28 @@ msgstr "%s; vil blive installeret automatisk"
msgid "%s is being installed manually."
msgstr "%s; vil blive installeret automatisk"
-#: 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 "S�g"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Danner oversigt"
-#: 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 "Danner oversigt"
-#: 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 "
@@ -4521,7 +4406,7 @@ msgstr ""
" Tilstedev�relsen af dette tr� betyder sandsynligvis at noget ikke er i "
"orden, enten p� dit system eller i Debian-arkivet."
-#: 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 "
@@ -4533,7 +4418,7 @@ msgstr ""
"at opfylde afh�ngigheder. Afinstalleringen vil medf�re at ingen "
"installeret pakke herefter vil have en 'vigtig' afh�ngighed af dem.\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 "
@@ -4543,7 +4428,7 @@ msgstr ""
" Disse pakker kunne opgraderes, men bliver tilbageholdt i deres aktuelle "
"tilstand for at undg� at bryde afh�ngigheder."
-#: 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 "
@@ -4553,7 +4438,7 @@ msgstr ""
" Disse pakker bliver installeret, fordi en anden pakke som du har valgt at "
"installere afh�nger af dem."
-#: 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 "
@@ -4564,7 +4449,7 @@ msgstr ""
"afh�ngigheder ikke l�ngere er opfyldt, eller fordi en anden pakke "
"konflikter med dem."
-#: 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 "
@@ -4574,7 +4459,7 @@ msgstr ""
"Versioner af disse pakker som er �ldre end de aktuelt installerede, vil "
"blive installeret"
-#: 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 "
@@ -4584,7 +4469,7 @@ msgstr ""
" Disse pakker kunne opgraderes, men du har �nsket at de tilbageholdes i "
"deres nuv�rende version."
-#: 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."
@@ -4592,7 +4477,7 @@ msgstr ""
"Pakker som vil blive geninstalleret\n"
" Disse pakker vil blive geninstalleret."
-#: 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 "
@@ -4601,7 +4486,7 @@ msgstr ""
"Pakker som vil blive installeret\n"
" Disse pakker er blevet manuelt udvalgt til installering p� systemet. "
-#: 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."
@@ -4609,7 +4494,7 @@ msgstr ""
"Pakker som vil blive afinstalleret\n"
" Disse pakker er manuelt udvalgt afinstallerering."
-#: 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."
@@ -4617,7 +4502,7 @@ msgstr ""
"Packages som vil blive opgraderet\n"
" Disse pakker vil blive opgraderet til en nyere version."
-#: 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 "
@@ -4627,7 +4512,7 @@ msgstr ""
" Disse pakker er ikke fuldt installeret og konfigureret. Der vil blive gjort "
"et fors�g p� at fuldf�re installeringen af dem."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4648,117 +4533,123 @@ 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 "Pakke"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Ikke installeret"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Afinstallerer %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 "Forkast installeringen af %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 "Forkast afinstalleringen af %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 "Behold %F i version %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 "Install�r(%s giver %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 version: %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 Versioner"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4768,7 +4659,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4776,192 +4667,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 afh�nger af %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 forh�ndsafh�nger af %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 foresl�r %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 anbefaler %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 konflikter med %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 �del�gger %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 erstatter %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 g�r %s for�ldet"
-#: 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 "Afinstall�r de f�lgende pakker:"
-#: 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 "Install�r de f�lgende pakker:"
-#: 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 "Afinstall�r de f�lgende pakker:"
-#: 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 "Opgrad�r de f�lgende pakker:"
-#: 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 "Nedgrad�r de f�lgende pakker:"
-#: 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 "Efterlad de f�lgende afh�ngigheder uafklaret:%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 "Afinstall�r %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 "Install�r %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 "Forkast installeringen af %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 "Forkast afinstalleringen af %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 "Behold %F i version %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 "Opgrad�r %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 "Nedgrad�r %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 "Afinstall�r(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Afinstall�r(%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 "Behold %F i version %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 "Behold %F i version %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 "Forkast installeringen af %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Forkast installeringen af %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Install�r %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 "Install�r %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 version: %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 version: %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 Versioner"
-#: 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 Versioner"
-#: 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"
@@ -4970,7 +4873,7 @@ msgid_plural "%s installs"
msgstr[0] "%d til installering"
msgstr[1] "%d til installering"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4979,7 +4882,7 @@ msgid_plural "%s removes"
msgstr[0] "%d til afinstallering"
msgstr[1] "%d til afinstallering"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4988,7 +4891,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d beholdes"
msgstr[1] "%d beholdes"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4997,7 +4900,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d til opgradering"
msgstr[1] "%d til opgradering"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5006,7 +4909,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d nedgraderinger"
msgstr[1] "%d nedgraderinger"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5014,35 +4917,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Se ^anbefalinger"
msgstr[1] "Se ^anbefalinger"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Ikke flere l�sninger."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "H�ndtering af afh�ngigheder"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Ikke flere l�sninger."
-#: 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 "Ikke flere l�sninger."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7869,6 +7772,71 @@ msgstr "Henter �ndringslog"
msgid "Download Changelog"
msgstr "Hent �ndringslog"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Install�r/afinstall�r pakker"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "Opdat�r pakkeliste"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Mark�r op^grad�rbare"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Ryd liste over nye pakker"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "A^nnull�r afventende handlinger"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^T�m pakkecache"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Slet f^or�ldede filer"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Genindl�s pakkecache"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Spil minestryger"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Bliv root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Afslut"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "slet"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "H�ndtering af afh�ngigheder"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(til %s)"
diff --git a/po/de.po b/po/de.po
index 6b0c36e9..c4bc16c8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.2.15.5\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-10-02 15:13+0200\n"
"Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -653,8 +653,8 @@ msgstr "Fataler Fehler im Auflöser"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Löse Abhängigkeiten auf"
-#: 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 "Interner Fehler: unerwartete Null-Lösung."
@@ -1758,7 +1758,7 @@ msgstr ""
"erzeugt."
#: 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 "Löse Abhängigkeiten auf ..."
@@ -1868,7 +1868,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Die folgenden Pakete haben verletzte Abhängigkeiten:\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>"
@@ -2004,8 +2004,8 @@ msgstr "Automatisch installiert"
msgid "no"
msgstr "nein"
-#: 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 "Version: "
@@ -2084,12 +2084,12 @@ msgid "Obsoletes"
msgstr "Ersetzt"
#: 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 "Liefert"
#: 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 "Beschreibung: "
@@ -2246,8 +2246,7 @@ msgstr "Aktuell"
msgid "Candidate"
msgstr "Kandidat"
-#: 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 "Installieren"
@@ -2397,7 +2396,7 @@ msgstr "NICHT ERFÜLLT"
msgid "UNAVAILABLE"
msgstr "NICHT VERFÜGBAR"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Marken"
@@ -2675,54 +2674,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 "Bereich"
-#: 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 "Nicht abgeschlossene Aktionen abbre^chen"
-#: 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 "»-« zum Entfernen von Paketen"
-#: 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 "kein echtes Paket"
-#: 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 "Die folgenden Pakete entfernen:"
-#: 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 "
@@ -3191,103 +3190,49 @@ msgstr ""
msgid "_File"
msgstr "Falsch"
-#: 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 "Durchführen geplanter Installations- und Löschvorgänge"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Installieren/Entfernen von Paketen"
-
-#: 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 "Nach neuen oder aktualisierten Paketen suchen"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "Paketliste ^aktualisieren"
-
-#: 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 ""
"Alle aktualisierbaren Pakete, die nicht zurückgehalten werden, für eine "
"Aktualisierung markieren"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Aktualisierbare ^markieren"
-
-#: 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 "Vergessen, welche Pakete »neu« sind"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "Neue Pakete ^vergessen"
-
-#: 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 ""
"Abbrechen aller nicht abgeschlossenen Installationen, Entfernungen, "
"Zurückhaltungen und Aktualisierungen."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Nicht abgeschlossene Aktionen abbre^chen"
-
-#: 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 "Alle Paketdateien aus dem Paketcache löschen"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Paketcache komplett ^leeren"
-
-#: 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 ""
"Nur solche Paketdateien aus dem Cache löschen, die nicht mehr "
"heruntergeladen werden können"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "^Nur veraltete Paketdateien löschen"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Paketcache neu laden"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "Paketcache ^neu laden"
-
-#: 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 "Zeit verschwenden (Minensuchspiel)"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Minesweeper ^spielen"
-
-#: 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"
@@ -3295,261 +3240,200 @@ msgstr ""
"»su« ausführen, um root zu werden. Dies wird das Programm neu starten, aber "
"Ihre Einstellungen werden erhalten bleiben"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "»root« werden"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Aptitude verlassen"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Beenden"
-
-#: 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 "Die letzte Operation oder Gruppe von Operationen rückgängig machen"
-#: 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 "löschen"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paket"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Ansichten"
-#: 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 "Abhängigkeitsbehandlung"
-
-#: 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 "löschen"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Hilfe"
-#: 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 "Listenaktualisierung"
-#: 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 "Pakete"
-#: 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 "Vorschau"
-#: 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 "Auflöser"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Installiert"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Entfernen"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Vollständig entfernen"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Beibehalten"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Zurückhalten"
-
-#: 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 "Die Paketliste nicht mehr filtern"
-#: 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 "Einen Filter auf die Paketliste anwenden"
-#: 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 "löschen"
+
+#: 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 "Suchen"
-#: 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 "neuinst."
-#: 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 "Feh "
-#: 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 "Abhängigkeiten von %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 "Falsch"
-#: 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 "Marken"
-#: 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 "Zustand"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Unbekannter Aktionstyp: %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 "
@@ -3558,151 +3442,132 @@ 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 "Unbekannter Aktionstyp: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "eine Erläuterung der Änderungen in der Lösung anzeigen"
-
-#: 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 "^Zurückgewiesene umschalten"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Einstellungen"
-#: 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 "Zustand"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "Lösung ^untersuchen"
# FIXME: s/to/for/?
-#: 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 "Die nächste Lösung dieser Abhängigkeitsprobleme wählen."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "Lösung ^untersuchen"
+#: 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 "Ausführen der Aktionen der aktuell gewählten Lösung."
-#: 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 "Aktualisierung"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Quellpaket: "
-#: 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 "Handbuch"
-#: 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 "Aktualisierung"
-#: 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 "ja"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3759,21 +3624,21 @@ msgstr "Herunterladen des Changelogs"
msgid "Downloading changelogs"
msgstr "Herunterladen des Changelogs"
-#: 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 für Änderungsprotokolle"
-#: 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"
@@ -3782,19 +3647,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d Aktualisierung"
msgstr[1] "%d Aktualisierungen"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Nicht installiert"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Das Paket %s konnte nicht gefunden werden"
-#: 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 "
@@ -3805,7 +3670,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3816,49 +3681,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Interner Fehler: Standard-Spalten-Zeichenkette nicht interpretierbar"
-#: 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 "Abhängigkeitsbehandlung"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Abhängigkeitsbehandlung"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Abhängigkeitsbehandlung"
-#: 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."
@@ -4124,6 +3989,10 @@ msgstr "Erneut installieren"
msgid "Downgrade"
msgstr "Deaktualisieren"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Entfernen"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4320,6 +4189,20 @@ msgstr "nicht installiert"
msgid "Install/Upgrade"
msgstr "Installiert"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Vollständig entfernen"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Beibehalten"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Zurückhalten"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4385,133 +4268,133 @@ msgstr "nein"
msgid "Unknown"
msgstr "Unbekannt"
-#: 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 "Keine Pakete passen zum Suchmuster »%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 "Paket: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s Versionen"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Installiere(%s stellt %s bereit)"
-#: 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-Version: %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 "Die folgenden Pakete in ihrer aktuellen Version beibehalten:"
-#: 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 "Nicht abgeschlossene Aktionen abbre^chen"
-#: 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 "Breche die Entfernung von %F ab"
-#: 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 "Breche die Entfernung von %F ab"
-#: 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 "Breche die Entfernung von %F ab"
-#: 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 "Breche die Installation von %F ab"
-#: 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 "Breche die Entfernung von %F ab"
-#: 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 "Breche die Installation von %F ab"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Entfernen(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Vollständig entfernen"
-#: 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« zum Markieren von Paketen als automatisch installiert"
-#: 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 "Das Paket »%s« wurde manuell installiert.\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« ist ein virtuelles Paket, das bereitgestellt wird von:\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: "
@@ -4541,28 +4424,28 @@ msgstr "%s; wird automatisch installiert"
msgid "%s is being installed manually."
msgstr "%s; wird automatisch installiert"
-#: 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 "Suchen"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Ansicht aufbauen"
-#: 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 "Ansicht aufbauen"
-#: 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 "
@@ -4577,7 +4460,7 @@ msgstr ""
" .\n"
" Dies ist ein Fehler, entweder auf Ihrem System oder im Debian-Archiv."
-#: 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 "
@@ -4589,7 +4472,7 @@ msgstr ""
"um Abhängigkeiten zu erfüllen. Nach den geplanten Änderungen wird kein "
"installiertes Paket mehr von Paketen in diesem Baum abhängen.\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 "
@@ -4599,7 +4482,7 @@ msgstr ""
" Diese Pakete könnten aktualisiert werden, aber sie wurden beibehalten, um "
"keine Abhängigkeiten zu verletzen."
-#: 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 "
@@ -4609,7 +4492,7 @@ msgstr ""
" Diese Pakete werden installiert, weil sie für ein anderes Paket notwendig "
"sind, das Sie zur Installation ausgewählt haben."
-#: 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 "
@@ -4620,7 +4503,7 @@ msgstr ""
"nicht mehr verfügbar sind oder weil ein Konflikt mit einem anderen Paket "
"besteht."
-#: 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 "
@@ -4630,7 +4513,7 @@ msgstr ""
" Eine ältere als die derzeit installierte Version dieser Pakete wird "
"installiert werden."
-#: 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 "
@@ -4640,7 +4523,7 @@ msgstr ""
" Diese Pakete könnten aktualisiert werden; auf Ihren Wunsch hin wird jedoch "
"die derzeitige Version beibehalten."
-#: 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."
@@ -4648,7 +4531,7 @@ msgstr ""
"Pakete, die erneut installiert werden\n"
" Diese Pakete werden erneut installiert werden."
-#: 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 "
@@ -4657,7 +4540,7 @@ msgstr ""
"Pakete, die installiert werden\n"
" Diese Pakete wurden manuell zur Installation ausgewählt."
-#: 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."
@@ -4665,7 +4548,7 @@ msgstr ""
"Pakete, die entfernt werden\n"
" Diese Pakete wurden manuell zum Entfernen ausgewählt."
-#: 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."
@@ -4673,7 +4556,7 @@ msgstr ""
"Pakete, die aktualisiert werden\n"
" Diese Pakete werden durch eine neuere Version ersetzt."
-#: 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 "
@@ -4683,7 +4566,7 @@ msgstr ""
" Diese Pakete sind nicht vollständig installiert und konfiguriert; es wird "
"versucht, sie fertig zu stellen."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4704,117 +4587,123 @@ 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 "Paket"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Nicht installiert"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Entferne %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 "Breche die Installation von %F ab"
-#: 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 "Breche die Entfernung von %F ab"
-#: 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 "Behalte %F in Version %s (%s) bei"
-#: 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 "Installiere(%s stellt %s bereit)"
-#: 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-Version: %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 Versionen"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4824,7 +4713,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4832,192 +4721,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 hängt ab von %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 hängt ab (vorher) von %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 schlägt %s vor"
-#: 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 empfiehlt %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 kollidiert mit %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 stört %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 ersetzt %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 ersetzt %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 "Die folgenden Pakete entfernen:"
-#: 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 "Die folgenden Pakete installieren:"
-#: 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 "Die folgenden Pakete entfernen:"
-#: 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 "Die folgenden Pakete aktualisieren:"
-#: 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 "Deaktualisieren der folgenden Pakete:"
-#: 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 "Die folgenden Abhängigkeiten unaufgelöst beibehalten:%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 "Entferne %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 "Installiere %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 "Breche die Installation von %F ab"
-#: 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 "Breche die Entfernung von %F ab"
-#: 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 "Behalte %F in Version %s (%s) bei"
-#: 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 "Aktualisiere %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 "Deaktualisiere %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 "Entfernen(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Entfernen(%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 "Behalte %F in Version %s (%s) bei"
-#: 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 "Behalte %F in Version %s (%s) bei"
-#: 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 "Breche die Installation von %F ab"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Breche die Installation von %F ab"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Installiere %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 "Installiere %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-Version: %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-Version: %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 Versionen"
-#: 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 Versionen"
-#: 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"
@@ -5026,7 +4927,7 @@ msgid_plural "%s installs"
msgstr[0] "%d Installation"
msgstr[1] "%d Installationen"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -5035,7 +4936,7 @@ msgid_plural "%s removes"
msgstr[0] "%d Entfernung"
msgstr[1] "%d Entfernungen"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -5044,7 +4945,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d Beibehaltung"
msgstr[1] "%d Beibehaltungen"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5053,7 +4954,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d Aktualisierung"
msgstr[1] "%d Aktualisierungen"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5062,7 +4963,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d Deaktualisierung"
msgstr[1] "%d Deaktualisierungen"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5070,35 +4971,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "^Empfehlungen überprüfen"
msgstr[1] "^Empfehlungen überprüfen"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Keine weiteren Lösungen."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Abhängigkeitsbehandlung"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Keine weiteren Lösungen."
-#: 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 "Keine weiteren Lösungen."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7993,6 +7894,76 @@ msgstr "Herunterladen des Changelogs"
msgid "Download Changelog"
msgstr "Herunterladen des Changelogs"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Installieren/Entfernen von Paketen"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "Paketliste ^aktualisieren"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Aktualisierbare ^markieren"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "Neue Pakete ^vergessen"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Nicht abgeschlossene Aktionen abbre^chen"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Paketcache komplett ^leeren"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "^Nur veraltete Paketdateien löschen"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "Paketcache ^neu laden"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Minesweeper ^spielen"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "»root« werden"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Beenden"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "löschen"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Abhängigkeitsbehandlung"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "eine Erläuterung der Änderungen in der Lösung anzeigen"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(für %s)"
diff --git a/po/dz.po b/po/dz.po
index cb2f5d00..288de8bc 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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: 2007-06-14 03:27+0530\n"
"Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -540,8 +540,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 "ནང་འཁོད་འཛོལ་བ:རེ་འདུན་མེད་པའི་ ཐབས་ཤེས་སྟོང་ཆ།"
@@ -1601,7 +1601,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "རྟེན་འབྲེལ་ཚུ་མོས་མཐུན་འབད་དོ།"
@@ -1705,7 +1705,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 "<སྟོང་ཆ།>"
@@ -1841,8 +1841,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 "ཐོན་རིམ:"
@@ -1921,12 +1921,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 "འགྲེལ་བཤད: "
@@ -2087,8 +2087,7 @@ msgstr ""
msgid "Candidate"
msgstr "CandVer"
-#: 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 "གཞི་བཙུགས།"
@@ -2231,7 +2230,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 "ངོ་རྟགས་ཚུ།"
@@ -2508,54 +2507,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 "བསྣར་ཏེ་ཡོད་པའི་བྱ་བ་ཚུ་ཆ་མེད་གཏང་།(^e)"
-#: 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 "
@@ -3007,100 +3006,46 @@ msgstr ""
msgid "_File"
msgstr "ཁ་བསྡམས།"
-#: 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 "ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས/རྩ་བསྐྲད་གཏང་།(^I)"
-
-#: 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 "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་དེ་དུས་མཐུན་བཟོ།(^U)"
-
-#: 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 "ཡར་བསྐྱེད་འབད་བཏུབ་མི་ལུ་རྟགས་བཀལ།(^g)"
-
-#: 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 "ཐུམ་སྒྲིལ་ག་དེ་\"new\"ཨིན་ན་སེམས་ཁར་ལས་བརྗེད་ད།"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "ཐུམ་སྒྲིལ་གསརཔ་ཚུ་སེམས་ཁར་ལས་བརྗེད་ད།(^F)"
-
-#: 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 "བསྣར་ཏེ་ཡོད་པའི་བྱ་བ་ཚུ་ཆ་མེད་གཏང་།(^e)"
-
-#: 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 "ཐུམ་སྒྲིལ་འདྲ་མཛོད་དེ་གཙང་དག་བཟོ། (^C)"
-
-#: 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 "ཕན་ཡིག་སྣོད་ཚུ་གཙང་དག་བཟོ། (^o)"
-
-#: 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 "ཐུམ་སྒྲིལ་འདྲ་མཛོད་དེ་ཡང་བསྐྱར་མངོན་གསལ་འབད།(^R)"
-
-#: 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 "འགས་རྫས་འཕྱག་མི་གཏང་། (^P)"
-
-#: 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"
@@ -3108,260 +3053,199 @@ msgstr ""
" 'ཨེསི་ཡུ་' དེ་རྩ་བ་ལུ་འགྱུར་ནིའི་དོན་ལུ་གཡོག་བཀོལ། འདི་གིས་ལས་རིམ་དེ་སླར་འགོ་བཙུགསཔ་ཨིན་ དེ་འབདཝ་"
"ད་ ཁྱོད་ཀྱི་སྒྲིག་སྟངས་དེ་ཉམས་སྲུང་འབད་བཞག་འོང་།"
-#: 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 "སྤང་།(^Q)"
-
-#: 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 "བཏོན་གཏང་།"
-
-#: 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 "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
-
-#: 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 "བཏོན་གཏང་།"
-
-#: 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 "ཕྱིར་བསྐྲད། (^P)"
-
-#: 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 "བཏོན་གཏང་།"
+
+#: 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 "སླར་གཞི་བཙུགས་འབད་ཡོདཔ།"
-#: 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 "བསྒྱུར་བཅོས་དྲན་དེབ། (^C)"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
msgid "Files"
msgstr "ཁ་བསྡམས།"
-#: 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 "
@@ -3370,149 +3254,130 @@ 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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-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 "སོར་སྟོན་སྣང་མེད་སྦེ་བཞག་ཡོདཔ།(^R)"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
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 ""
@@ -3565,21 +3430,21 @@ msgstr "བསྒྱུར་བཅོས་དྲེན་དེབ་ཕབ་
msgid "Downloading changelogs"
msgstr "བསྒྱུར་བཅོས་དྲེན་དེབ་ཕབ་ལེན་འབད་དོ།"
-#: 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 "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་་ནི་གི་ཡུ་ཨཱར་ཨེལ།"
-#: 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"
@@ -3588,19 +3453,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d ཡར་བསྐྱེད་འབད།"
msgstr[1] "%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 "
@@ -3611,7 +3476,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3622,49 +3487,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "^Dependency handling"
msgid "Find dependency chains: end"
msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "^Dependency handling"
msgid "Find dependency chains: results"
msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
-#: 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."
@@ -3924,6 +3789,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 ""
@@ -4122,6 +3991,20 @@ msgstr "གཞི་བཙུགས་མ་འབད་བས།"
msgid "Install/Upgrade"
msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "ཕྱིར་བསྐྲད། (^P)"
+
+#: 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 ""
@@ -4183,130 +4066,130 @@ 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 version %s"
msgstr "%s %s (%s) དེ་གཞི་བཙུགས་འབད་དོ།"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
#| msgid "libsigc++ version: %s\n"
msgid "Downgrade to %s version %s"
msgstr "libsigc++ཐོན་རིམ་: %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 "བསྣར་ཏེ་ཡོད་པའི་བྱ་བ་ཚུ་ཆ་མེད་གཏང་།(^e)"
-#: 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"
msgstr "རྩ་བསྐྲད།"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "ཕྱིར་བསྐྲད། (^P)"
-#: 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 "Mark %s as manually installed."
msgstr "ཐུམ་སྒྲིལ་ཚུ་ལག་ཐོག་ལས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ '&m'"
-#: 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: "
@@ -4336,28 +4219,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 "
@@ -4373,7 +4256,7 @@ msgstr ""
"རྩ་འབྲེལ་དེ་ངོ་འཛོམས་སྦེ་ཡོད་མི་དེ་གིས་ ཁྱོད་ཀྱི་རིམ་ལུགས་དང ་ཡང་ན་ དེ་བི་ཡཱན་ཡིག་མཛོད་ནང་ལུ་ ག་ཅི་ཅིག་"
"ཆད་སོང་ཡོད་པའི་བརྡ་སྟོནམ་ཨིན། "
-#: 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 "
@@ -4386,7 +4269,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 "
@@ -4396,7 +4279,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 "
@@ -4406,7 +4289,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 "
@@ -4416,7 +4299,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 "
@@ -4425,7 +4308,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 "
@@ -4435,7 +4318,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."
@@ -4443,7 +4326,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 "
@@ -4452,7 +4335,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."
@@ -4460,7 +4343,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."
@@ -4468,7 +4351,7 @@ msgstr ""
"ཡར་བསྐྱེད་འབད་ནིའི་ཐུམ་སྒྲིལ་ཚུ།\n"
"ཐུམ་སྒྲིལ་འདི་ཚུ་ཐོན་རིམ་གསར་པའི་ནང་ལུ་ཡར་བསྐྱེད་འབད་འོང་།"
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4479,7 +4362,7 @@ msgstr ""
"ཐུམ་སྒྲིས་འདི་ཚུ་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་ཨིན ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ གཞི་བཙུགས་ཀྱི་དོན་ལུ་ཁྱོད་ཀྱིས་གདམ་ཁ་"
"བརྐྱབས་ཡོད་མི་ཐུམ་སྒྲིལ་གཞན་མི་ཅིག་ལུ་དགོས་མཁོ་ཡོདཔ་ཨིན།"
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4500,116 +4383,122 @@ 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 "Installing %s version %s is rejected."
msgstr "%s %s (%s) དེ་གཞི་བཙུགས་འབད་དོ།"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
#| msgid "libsigc++ version: %s\n"
msgid "Downgrading %s to version %s is rejected."
msgstr "libsigc++ཐོན་རིམ་: %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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4619,7 +4508,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4627,191 +4516,203 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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
#, fuzzy, c-format
#| msgid "%s replaces %s"
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 "<b>Remove</b> %s"
msgstr "རྩ་བསྐྲད།"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "རྩ་བསྐྲད།"
-#: 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 "libsigc++ version: %s\n"
msgid "<b>Downgrade</b> %s to version %s"
msgstr "libsigc++ཐོན་རིམ་: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
#| msgid "libsigc++ version: %s\n"
msgid "<b>downgrade</b> %s to version %s"
msgstr "libsigc++ཐོན་རིམ་: %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"
@@ -4820,7 +4721,7 @@ msgid_plural "%s installs"
msgstr[0] "%d གཞི་བཙུགས་འབད་ནི།"
msgstr[1] "%d གཞི་བཙུགས་འབད་ནི་ཚུ།"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4829,7 +4730,7 @@ msgid_plural "%s removes"
msgstr[0] "%d རྩ་བསྐྲད།"
msgstr[1] "%d རྩ་བསྐྲད་ཚུ།"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4838,7 +4739,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d བདག་འཛིན་སྦེ་བཞག"
msgstr[1] "%d བདག་འཛིན་སྦེ་བཞགཔ་ཨིན།"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4847,7 +4748,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d ཡར་བསྐྱེད་འབད།"
msgstr[1] "%d ཡར་བསྐྱེད་འབདཝ་ཨིན། "
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4856,7 +4757,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d མར་ཕབ་འབད།"
msgstr[1] "%d མར་ཕབ་འབདཝ་ཨིན།"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4864,35 +4765,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "རྩིས་ཞིབ་འོས་སྦྱོར།(^R)"
msgstr[1] "རྩིས་ཞིབ་འོས་སྦྱོར།(^R)"
-#: 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 "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
-#: 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 ""
@@ -7738,6 +7639,76 @@ msgid "Download Changelog"
msgstr "བསྒྱུར་བཅོས་དྲན་དེབ་ཕབ་ལེན་འབད།"
#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས/རྩ་བསྐྲད་གཏང་།(^I)"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་དེ་དུས་མཐུན་བཟོ།(^U)"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "ཡར་བསྐྱེད་འབད་བཏུབ་མི་ལུ་རྟགས་བཀལ།(^g)"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "ཐུམ་སྒྲིལ་གསརཔ་ཚུ་སེམས་ཁར་ལས་བརྗེད་ད།(^F)"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "བསྣར་ཏེ་ཡོད་པའི་བྱ་བ་ཚུ་ཆ་མེད་གཏང་།(^e)"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་དེ་གཙང་དག་བཟོ། (^C)"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "ཕན་ཡིག་སྣོད་ཚུ་གཙང་དག་བཟོ། (^o)"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་དེ་ཡང་བསྐྱར་མངོན་གསལ་འབད།(^R)"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "འགས་རྫས་འཕྱག་མི་གཏང་། (^P)"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "རྩ་བ་ལུ་འགྱུར།"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "སྤང་།(^Q)"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "བཏོན་གཏང་།"
+
+#, fuzzy
+#~| msgid "^Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "བསྒྱུར་བཅོས་ཚུ་གི་གསལ་བཤད་དེ་ཐབས་ཤེས་ཀྱི་ནང་ལུ་སྟོན།"
+
+#, fuzzy
#~| msgid "^Dependency handling"
#~ msgid "Dependency Chain"
#~ msgstr "རྟེན་འབྲེལ་ལེགས་སྐྱོང་འཐབ་ནི།(^D)"
diff --git a/po/el.po b/po/el.po
index 53f8b702..93326f8d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-09-11 15:53+0200\n"
"Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -660,8 +660,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 "Εσωτερικό σφάλμα: απρόσμενη κενή λύση"
@@ -1758,7 +1758,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 "Επίλυση εξαρτήσεων..."
@@ -1865,7 +1865,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>"
@@ -2001,8 +2001,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 "Εκδοση: "
@@ -2081,12 +2081,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 "Περιγραφή: "
@@ -2240,8 +2240,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 "Εγκατάσταση"
@@ -2382,7 +2381,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 "Ετικέτες"
@@ -2662,54 +2661,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 "
@@ -3173,101 +3172,47 @@ msgstr ""
msgid "_File"
msgstr "Ψευδές"
-#: 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 "Εκκαθάριση του cache των πακέτων"
-
-#: 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 "Επαναφόρτωση του cache των πακέτων"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "Επαναφόρτωση του cache πακέτων"
-
-#: 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"
@@ -3275,261 +3220,200 @@ msgstr ""
"Εκτελέστε την εντολή 'su' για να γίνετε ο χρήστης root. Αυτή θα "
"επανεκτελέσει το πρόγραμμα, αλλά οι ρυθμίσεις θα διατηρηθούν"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Μετατροπή σε root"
-
-#: 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 "διαγραφή"
-
-#: 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 "διαγραφή"
-
-#: 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 "Resolver"
-#: 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 "^Διαγραφή"
-
-#: 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 "διαγραφή"
+
+#: 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 "επανεγκατάσταση"
-#: 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 "Α^ρχείο Αλλαγών"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Ψευδές"
-#: 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 "
@@ -3538,72 +3422,57 @@ 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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-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 ""
@@ -3611,78 +3480,74 @@ msgid ""
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 ""
@@ -3735,21 +3600,21 @@ msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
msgid "Downloading changelogs"
msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
-#: 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 "Διεύθυνση που θα χρησιμοποιηθεί για τη μεταφόρτωση των αρχείων αλλαγών"
-#: 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"
@@ -3758,19 +3623,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d αναβάθμιση"
msgstr[1] "%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 "
@@ -3781,7 +3646,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3792,50 +3657,50 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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."
@@ -4100,6 +3965,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 ""
@@ -4295,6 +4164,20 @@ msgstr "μη εγκατεστημένο"
msgid "Install/Upgrade"
msgstr "Εγκατεστημένο"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Διαγραφή"
+
+#: 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 ""
@@ -4360,132 +4243,132 @@ 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 "^Διαγραφή"
-#: 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 "Mark %s as manually installed."
msgstr "'&m' επισήμανση πακέτων σαν χειροκίνητα εγκατεστημμένων"
-#: 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: "
@@ -4515,28 +4398,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 "
@@ -4552,7 +4435,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 "
@@ -4564,7 +4447,7 @@ msgstr ""
"ικανοποιήσουν εξαρτήσεις, και από τη διαδικασία αυτή δεν θα προκύψει "
"πρόβλημα από πακέτο που να θεωρεί τα πακέτα αυτά ως σημαντικά 'important'.\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 "
@@ -4574,7 +4457,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 "
@@ -4584,7 +4467,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 "
@@ -4594,7 +4477,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 "
@@ -4604,7 +4487,7 @@ msgstr ""
" Θα εγκαταστήσετε μια παλαιότερη έκδοση ενός πακέτου από αυτή που έχετε "
"εγκατεστημένη."
-#: 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 "
@@ -4614,7 +4497,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."
@@ -4622,7 +4505,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 "
@@ -4631,7 +4514,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."
@@ -4639,7 +4522,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."
@@ -4647,7 +4530,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 "
@@ -4657,7 +4540,7 @@ msgstr ""
" Αυτά τα πακέτα δεν είναι πλήρως εγκατεστημένα και ρυθμισμένα. Θα γίνει μία "
"προσπάθεια για πλήρη εγκατάστασή τους."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4678,117 +4561,123 @@ 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4798,7 +4687,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4806,192 +4695,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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"
@@ -5000,7 +4901,7 @@ msgid_plural "%s installs"
msgstr[0] "%d εγκατάσταση"
msgstr[1] "%d εγκαταστάσεις"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -5009,7 +4910,7 @@ msgid_plural "%s removes"
msgstr[0] "%d αφαίρεση"
msgstr[1] "%d αφαιρέσεις"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -5018,7 +4919,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d διατήρηση"
msgstr[1] "%d διατηρήσεις"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5027,7 +4928,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d αναβάθμιση"
msgstr[1] "%d αναβαθμίσεις"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5036,7 +4937,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d υποβαθμίζεται"
msgstr[1] "%d υποβαθμίζονται"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5044,35 +4945,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Εξέταση ^Συστάσεων"
msgstr[1] "Εξέταση ^Συστάσεων"
-#: 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 ""
@@ -7936,6 +7837,76 @@ msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
msgid "Download Changelog"
msgstr "Κατέβασμα Αρχείου Αλλαγών"
+#, 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 "Εκκαθάριση του cache των πακέτων"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Εκκαθάριση ^περιττών αρχείων"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "Επαναφόρτωση του cache πακέτων"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Παίξε Ναρκαλιευτή"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Μετατροπή σε root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "Έξοδος"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "διαγραφή"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Διαχείριση εξαρτήσεων"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "δες μια εξήγηση των αλλαγών στη λύση αυτή"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(για %s)"
diff --git a/po/es.po b/po/es.po
index 95ea38a3..a94e5144 100644
--- a/po/es.po
+++ b/po/es.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.11\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: 2009-06-15 01:22+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian-l10n-Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -672,8 +672,8 @@ msgstr "Error falta al resolver"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Resolviendo las dependencias"
-#: 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 "Error interno: solución nula inesperada."
@@ -732,7 +732,6 @@ msgstr "No pudo encontrarse un archivo fuente para el paquete \"%s\".\n"
#: src/cmdline/cmdline_action.cc:205
#, c-format
-#| msgid "Unable to satisfy the build-depends: %s."
msgid "Unable to satisfy the build-depends: %s.\n"
msgstr "No se pudieron satisfacer las dependencias de compilación: %s.\n"
@@ -1768,7 +1767,7 @@ msgstr ""
"de dependencias."
#: 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 "Resolviendo las dependencias..."
@@ -1863,13 +1862,11 @@ msgstr "búsqueda: Debe proporcionar al menos una término de búsqueda\n"
#: src/cmdline/cmdline_show_broken.cc:86
#, c-format
-#| msgid "but it is not installable"
msgid "but it is not installable."
msgstr "pero no es instalable."
#: src/cmdline/cmdline_show_broken.cc:88
#, c-format
-#| msgid "but %s is to be installed."
msgid "but it is not going to be installed."
msgstr "pero no será instalado."
@@ -1879,7 +1876,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "No se satisfacen las dependencias de los siguientes paquetes:\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>"
@@ -1957,13 +1954,11 @@ msgstr " [retenido]"
#: src/cmdline/cmdline_show.cc:299
#, c-format
-#| msgid "%s; will be installed"
msgid "%s%s; will be installed"
msgstr "%s%s; será instalado"
#: src/cmdline/cmdline_show.cc:301
#, c-format
-#| msgid "%s; will be installed automatically"
msgid "%s%s; will be installed automatically"
msgstr "%s%s; se instalará automáticamente"
@@ -2015,8 +2010,8 @@ msgstr "Instalado automáticamente"
msgid "no"
msgstr "no"
-#: 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 "Versión: "
@@ -2095,12 +2090,12 @@ msgid "Obsoletes"
msgstr "Hace obsoleto a"
#: 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 "Proporciona"
#: 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 "Descripción: "
@@ -2257,8 +2252,7 @@ msgstr "Actual"
msgid "Candidate"
msgstr "Candidato"
-#: 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 "Instalar"
@@ -2358,7 +2352,6 @@ msgstr "No se pudo encontrar una razón para instalar %s.\n"
#: src/cmdline/cmdline_why.cc:1131
#, c-format
-#| msgid "Packages depending on %s"
msgid "Packages requiring %s:"
msgstr "Paquetes que dependen de %s:"
@@ -2374,8 +2367,6 @@ msgstr "No se pudo interpretar algunos patrón de comparación."
#: src/cmdline/cmdline_why.cc:1243
#, c-format
-#| msgid ""
-#| "%s: this command requires at least one argument (the package to query)."
msgid ""
"%s: this command requires at least one argument (the package to query).\n"
msgstr ""
@@ -2399,7 +2390,7 @@ msgstr "INSATISFECHO"
msgid "UNAVAILABLE"
msgstr "NO DISPONIBLE"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Marcas"
@@ -2682,51 +2673,48 @@ 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
-#| msgid "Section"
+#: src/generic/apt/aptitude_resolver_universe.cc:878
msgid "Safe actions"
msgstr "Acciones seguras"
-#: 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 "Cance^lar acciones pendientes"
-#: src/generic/apt/aptitude_resolver_universe.cc:873
-#| msgid "'-' to remove packages"
+#: src/generic/apt/aptitude_resolver_universe.cc:880
msgid "Remove packages"
msgstr "Eliminar paquetes"
-#: 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 "no es un paquete real"
-#: src/generic/apt/aptitude_resolver_universe.cc:875
+#: src/generic/apt/aptitude_resolver_universe.cc:882
msgid "Install versions from non-default sources"
msgstr "Instalar versiones de fuentes no predeterminadas"
-#: src/generic/apt/aptitude_resolver_universe.cc:876
-#| msgid "Remove the following packages:"
+#: src/generic/apt/aptitude_resolver_universe.cc:883
msgid "Remove essential packages"
msgstr "Eliminar paquetes instalados"
-#: 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 "
@@ -3009,7 +2997,6 @@ msgstr "Tipo de dependencia desconocida: %s"
#: src/generic/apt/matching/parse.cc:860
#, c-format
-#| msgid "Unknown matcher type: \"%s\"."
msgid "Unknown term type: \"%s\"."
msgstr "Tipo de patrón desconocido: «%s»."
@@ -3050,7 +3037,6 @@ msgstr "Expresión vacía no esperada"
#: src/generic/apt/matching/parse.cc:1391
#, c-format
-#| msgid "Badly formed expression"
msgid "Badly formed expression: expected '|', got '%c'"
msgstr "Expresión mal formada: esperaba «|», obtuve «%c»"
@@ -3191,101 +3177,47 @@ msgstr "Gestor de Paquetes Aptitude"
msgid "_File"
msgstr "Falso"
-#: 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 "Realizar todas las instalaciones y eliminaciones pendientes"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Instalar/eliminar paquetes"
-
-#: 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 "Buscar nuevas versiones de los paquetes"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Actualizar la lista de paquetes"
-
-#: 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 ""
"Marcar todos los paquetes actualizables que no están retenidos para que sean "
"actualizados"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Marcar ^actualizable"
-
-#: 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 "Olvidar que paquetes son «nuevos»"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Olvidar paquetes nuevos"
-
-#: 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 ""
"Cancelar todas las instalaciones, eliminaciones, bloqueos y actualizaciones "
"pendientes."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Cance^lar acciones pendientes"
-
-#: 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 "Borra los ficheros de paquetes descargados previamente"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Limpiar el almacén de paquetes"
-
-#: 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 "Borra los ficheros de paquetes que ya no pueden ser descargados"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Limpiar ficheros ^obsoletos"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Recarga el almacén de paquetes"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Recargar el almacén de paquetes"
-
-#: 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 "Pierda su tiempo intentando buscar las minas"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Jugar al buscaminas"
-
-#: 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"
@@ -3293,252 +3225,179 @@ msgstr ""
"Ejecuta «su» para convertirse en administrador. Esto reiniciará el programa "
"pero se mantendrán sus preferencias."
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Convertirse en administrador"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Salir del programa"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Salir"
-
-#: 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 "Deshacer la última operación o grupo de operaciones sobre los paquetes"
-#: 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 "eliminar"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paquete"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Vistas"
-#: 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 ""
"Ver los errores ocurridos en el sistema apt desde que se inicio el programa."
-#: 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 "Encuentra cadenas de dependencias entre un paquete y otro."
-#: src/gtk/aptitude.glade:326
-#, fuzzy
-#| msgid "Dependency handling"
-msgid "Find _Dependency Chains"
-msgstr "Gestión de dependencias"
-
-#: 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 "eliminar"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Ayuda"
-#: 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
-#| msgid "List Update"
+#: src/gtk/aptitude.glade:344
msgid "Update"
msgstr "Actualizar"
-#: 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 "Paquetes"
-#: 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 "Previsualizar"
-#: 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 "Solucionador"
-#: src/gtk/aptitude.glade:462
-#| msgid "Installed"
+#: src/gtk/aptitude.glade:388
msgid "Install/Remove"
msgstr "Instalar/Eliminar"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Eliminar"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "Purgar"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Mantener"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Retener"
-
-#: 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 "Eliminar el filtro de la lista de paquetes"
-#: src/gtk/aptitude.glade:747
-#| msgid "Apply a filter to the package list"
+#: src/gtk/aptitude.glade:646
msgid "Apply these settings to all active package lists."
msgstr "Aplicar éstas opciones a todas las listas de paquetes activa."
-#: src/gtk/aptitude.glade:811 src/gtk/aptitude.glade:1490
-#: src/gtk/aptitude.glade:1809 src/gtk/aptitude.glade:1945
-#| msgid "Search"
+#: src/gtk/aptitude.glade:664
+#, fuzzy
+#| msgid "delete"
+msgid "gtk-close"
+msgstr "eliminar"
+
+#: src/gtk/aptitude.glade:719 src/gtk/aptitude.glade:1425
+#: src/gtk/aptitude.glade:1754 src/gtk/aptitude.glade:1892
msgid "Search:"
msgstr "Buscar:"
-#: 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
-#| msgid "reinstall"
+#: src/gtk/aptitude.glade:750
msgid "Incremental"
msgstr "Incremental"
-#: src/gtk/aptitude.glade:862 src/gtk/aptitude.glade:1528
-#: src/gtk/aptitude.glade:1847 src/gtk/aptitude.glade:1983
-#| msgid "Err "
+#: src/gtk/aptitude.glade:770 src/gtk/aptitude.glade:1464
+#: src/gtk/aptitude.glade:1793 src/gtk/aptitude.glade:1931
msgid "Errors"
msgstr "Errores"
-#: 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 "Mostrar."
-#: src/gtk/aptitude.glade:986
+#: src/gtk/aptitude.glade:895
msgid "<span size=\"xx-large\">Versions:</span>"
msgstr ""
-#: src/gtk/aptitude.glade:1046
-#| msgid "Dependencies of %s"
+#: src/gtk/aptitude.glade:956
msgid "Dependencies"
msgstr "Dependencias"
-#: src/gtk/aptitude.glade:1076
-#| msgid "^Changelog"
+#: src/gtk/aptitude.glade:986
msgid "Changelog"
msgstr "Registro de cambios"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Falso"
-#: 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
-#| msgid "Tags"
+#: src/gtk/aptitude.glade:1045
msgid "tags"
msgstr "etiquetas"
-#: 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 "Calculando la actualización..."
-#: src/gtk/aptitude.glade:1229
+#: src/gtk/aptitude.glade:1164
+msgid "<b>Solutions</b>"
+msgstr "<b>Soluciones</b>"
+
+#: src/gtk/aptitude.glade:1182 src/gtk/download.cc:261
+#: src/gtk/entityview.cc:551
+msgid "Status"
+msgstr "Estado"
+
+#: src/gtk/aptitude.glade:1216
+msgid "Group by action type"
+msgstr "Agrupar por tipo de acción"
+
+#: 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 "
@@ -3547,87 +3406,66 @@ msgid ""
"This is the default view mode."
msgstr ""
-#: src/gtk/aptitude.glade:1232
-#| msgid "Unknown action type: %s"
-msgid "Group by action type"
-msgstr "Agrupar por tipo de acción"
+#: 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 "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "Ver una explicación de la solución"
-
-#: src/gtk/aptitude.glade:1263
+#: src/gtk/aptitude.glade:1255
msgid "<b>View Mode</b>"
msgstr ""
-#: src/gtk/aptitude.glade:1307
-#| msgid "Toggle ^Rejected"
+#: src/gtk/aptitude.glade:1297
msgid "Rejected"
msgstr "Rechazado"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Preferencias"
-#: src/gtk/aptitude.glade:1331
+#: src/gtk/aptitude.glade:1328
msgid "Accepted"
msgstr "Aceptado"
-#: 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
-#| msgid "State"
-msgid "Status"
-msgstr "Estado"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr "<b>Soluciones</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
+msgstr "Buscar una solución nueva"
-#: src/gtk/aptitude.glade:1442
-#| msgid "Select the next solution to the dependency problems."
+#: src/gtk/aptitude.glade:1373
msgid "Calculate the next solution that has not yet been generated."
msgstr "Calcular la solución siguiente que aún no ha sido generada"
-#: src/gtk/aptitude.glade:1443
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "Buscar una solución nueva"
+#: 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 "Realizar las acciones de la solución seleccionada."
-#: src/gtk/aptitude.glade:1458
-msgid "gtk-apply"
-msgstr ""
-
-#: src/gtk/aptitude.glade:1607
-#| msgid "Upgrade"
+#: src/gtk/aptitude.glade:1543
msgid "Upgrade Summary"
msgstr "Actualizar Sumario"
-#: src/gtk/aptitude.glade:1636
-#| msgid "Source Package: "
+#: src/gtk/aptitude.glade:1572
msgid "Selected Package"
msgstr "Paquete seleccionado"
-#: 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."
@@ -3635,55 +3473,54 @@ msgstr ""
"Etiqueta explicando la actualización. Éste texto no aparecerá en el "
"programa en ejecución."
-#: src/gtk/aptitude.glade:1682
-#| msgid "Manual"
+#: src/gtk/aptitude.glade:1619
msgid "Fix Manually"
msgstr "Arreglar manualmente"
-#: 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 "Actualizar"
-#: 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 "Una terminal ejecutando dpkg se mostrará aquí."
-#: 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 "sí"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3707,7 +3544,6 @@ msgstr ""
#: src/gtk/changelog.cc:373
#, c-format
-#| msgid "URL to use to download changelogs"
msgid "Failed to download the changelog: %s"
msgstr "Fallo al descargar el registro de cambios: %s"
@@ -3727,48 +3563,41 @@ msgid ""
msgstr "Sólo puede ver registros de cambios de paquetes de Debian oficiales."
#: src/gtk/changelog.cc:503
-#| msgid "Downloading Changelog"
msgid "Downloading changelog; please wait..."
msgstr "Descargando registro de cambios; por favor, espere..."
#: src/gtk/changelog.cc:563
-#| msgid "Downloading Changelog"
msgid "Downloading changelogs"
msgstr "Descargando registro de cambios"
-#: src/gtk/dashboardtab.cc:210
+#: src/gtk/dashboardtab.cc:211
msgid "Resolve Upgrade Manually"
msgstr "Resolver actualización manualmente"
-#: src/gtk/dashboardtab.cc:306
-#| msgid "URL to use to download changelogs"
+#: src/gtk/dashboardtab.cc:307
msgid "Preparing to download changelogs"
msgstr "Preparando para descargar registros de cambios."
-#: src/gtk/dashboardtab.cc:396
+#: src/gtk/dashboardtab.cc:397
msgid "Available upgrades:"
msgstr "Actualizaciones disponibles:"
-#: src/gtk/dashboardtab.cc:413
+#: src/gtk/dashboardtab.cc:414
#, c-format
-#| msgid "%d upgrade"
-#| msgid_plural "%d upgrades"
msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%d actualización disponible:"
msgstr[1] "%d actualizaciones disponibles:"
-#: src/gtk/dashboardtab.cc:629
-#| msgid "Not Installed"
+#: src/gtk/dashboardtab.cc:630
msgid "No upgrades are available."
msgstr "No hay actualizaciones disponibles."
-#: src/gtk/dashboardtab.cc:641
-#| msgid "Unable to locate package %s"
+#: src/gtk/dashboardtab.cc:642
msgid "Unable to calculate an upgrade."
msgstr "No se pudo calcular la actualización."
-#: 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 "
@@ -3779,7 +3608,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3790,7 +3619,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "
@@ -3798,40 +3627,35 @@ msgid ""
msgstr ""
"No se pudo calcular una actualización. Pulse «%s» para buscar una solución."
-#: src/gtk/dashboardtab.cc:704
+#: src/gtk/dashboardtab.cc:705
#, c-format
-#| msgid "Internal error: Default column string is unparsable"
msgid "Internal error encountered while calculating an upgrade: %s"
msgstr "Un error interno ocurrió calculando una actualización: %s"
-#: 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
-#| msgid "Dependency handling"
+#: src/gtk/dependency_chains_tab.cc:78
msgid "Find dependency chains: start"
msgstr "Encontrar cadenas de dependencias: inicio"
-#: src/gtk/dependency_chains_tab.cc:79
-#| msgid "Dependency handling"
+#: src/gtk/dependency_chains_tab.cc:82
msgid "Find dependency chains: end"
msgstr "Encontrar cadenas de dependencias: final"
-#: src/gtk/dependency_chains_tab.cc:81
-#| msgid "Dependency handling"
+#: src/gtk/dependency_chains_tab.cc:86
msgid "Find dependency chains: results"
msgstr "Encontrar cadenas de dependencias: resultados"
-#: 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
-#| msgid "Dependency handling"
+#: src/gtk/dependency_chains_tab.cc:281
msgid "No dependency chain found."
msgstr "Nó se encontró ninguna cadena de dependencias."
@@ -3840,17 +3664,14 @@ msgid "Ignored"
msgstr "Ignorado"
#: src/gtk/download.cc:185
-#| msgid "False"
msgid "Failed"
msgstr "Falló"
#: src/gtk/download.cc:193
-#| msgid "Deleting downloaded files"
msgid "Already downloaded"
msgstr "Ya ha sido descargado"
#: src/gtk/download.cc:204
-#| msgid "none"
msgid "Done"
msgstr "Finalizado"
@@ -3862,12 +3683,10 @@ msgstr "Descripción"
# No me gusta mucho la traducción de 'progreso'
# en este contexto, pero no se me ocurre una mejor
#: src/gtk/download.cc:253
-#| msgid "Total Progress: "
msgid "Progress"
msgstr "Progreso total"
#: src/gtk/download.cc:264
-#| msgid "Description"
msgid "Short Description"
msgstr "Descripción corta"
@@ -3876,12 +3695,10 @@ msgid "URI"
msgstr ""
#: src/gtk/download.cc:319
-#| msgid "Cleaning while a download is in progress is not allowed"
msgid "The download is still in progress. Should it be canceled?"
msgstr "La descarga aun esta activa. Debería ser cancelada?"
#: src/gtk/download.cc:395 src/gtk/gui.cc:776
-#| msgid "View next display"
msgid "View Details"
msgstr "Ver detalles"
@@ -3901,13 +3718,11 @@ msgstr "%s: %lu/%lu, %sB/s"
#: src/gtk/download.cc:486
#, c-format
-#| msgid "%s; will be installed"
msgid "%s: %lu/%lu, stalled"
msgstr "%s: %lu/%lu, pausado"
#: src/gtk/download.cc:507
#, c-format
-#| msgid " [ %i%% ] (%sB/s, %s remaining)"
msgid "%s: %sB of %sB at %sB/s, %s remaining"
msgstr "%s: %sB de %sB a %sB/s, %s restantes"
@@ -3938,7 +3753,6 @@ msgstr ""
#: src/gtk/dpkg_terminal.cc:429
#, c-format
-#| msgid "Unable to create temporary directory from template \"%s\": %s"
msgid "%s: Unable to accept a connection: %s"
msgstr "%s: No se puedo aceptar una conexión: %s"
@@ -3963,7 +3777,6 @@ msgid "[%s] dpkg process complete; there are more packages left to process.\n"
msgstr ""
#: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
-#| msgid "ProgName"
msgid "Name"
msgstr "Nombre"
@@ -3998,17 +3811,14 @@ msgid "Whether the package is automatically installed."
msgstr "«&M» para marcar paquetes como instalados automáticamente"
#: src/gtk/entityview.cc:576
-#| msgid "Cancel any action on the selected package"
msgid "The name and description of the package."
msgstr "El nombre y la descripción del paquete."
#: src/gtk/entityview.cc:591
-#| msgid "Version: "
msgid "Version"
msgstr "Versión"
#: src/gtk/entityview.cc:592
-#| msgid "Check for new versions of packages"
msgid "The version number of the package."
msgstr "El numero de versión del paquete."
@@ -4028,7 +3838,6 @@ msgid "Files list is only available for installed packages."
msgstr "La lista de archivos está solo disponible para paquetes instalados."
#: src/gtk/gui.cc:78
-#| msgid "not installed"
msgid "Not installed"
msgstr "No instalado"
@@ -4037,17 +3846,14 @@ msgid "Virtual"
msgstr "Virtual"
#: src/gtk/gui.cc:80
-#| msgid "unpacked"
msgid "Unpacked"
msgstr "Desempaquetado"
#: src/gtk/gui.cc:81
-#| msgid "half-config"
msgid "Half-configured"
msgstr "Medio configurado"
#: src/gtk/gui.cc:82
-#| msgid "half-install"
msgid "Half-installed"
msgstr "Medio instalado"
@@ -4081,17 +3887,19 @@ msgstr "Reinstalar"
msgid "Downgrade"
msgstr "Desactualizar"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Eliminar"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
#: src/gtk/gui.cc:95
-#| msgid "forbidden upgrade"
msgid "Hold (don't upgrade)"
msgstr "Retener (no actualizar)"
#: src/gtk/gui.cc:97
-#| msgid "Related Dependencies"
msgid "Unsatisfied dependencies"
msgstr "Dependencias no satisfechas"
@@ -4104,12 +3912,10 @@ msgid "Insufficient privileges."
msgstr "Privilegios insuficientes."
#: src/gtk/gui.cc:234
-#| msgid "Apply a filter to the package list"
msgid "You must be root to update the package lists."
msgstr "Solo el administrador puede actualizar las listas."
#: src/gtk/gui.cc:242 src/gtk/gui.cc:890
-#| msgid "Downloading..."
msgid "Download already running."
msgstr "Descarga en curso."
@@ -4121,13 +3927,11 @@ msgstr ""
#: src/gtk/gui.cc:303
#, c-format
-#| msgid "List Update"
msgid "Update %s?"
msgstr "Actualizar %s?"
#: src/gtk/gui.cc:329
#, c-format
-#| msgid "Unable to replace %s with new configuration file"
msgid ""
"Replace configuration file\n"
"'%s'?"
@@ -4160,30 +3964,25 @@ msgid ""
msgstr ""
#: src/gtk/gui.cc:720
-#| msgid "%s changes"
msgid "Done applying changes!"
msgstr "Cambios aplicados"
#: src/gtk/gui.cc:767
-#| msgid "%s changes"
msgid "Applying changes..."
msgstr "Aplicando cambios..."
#: src/gtk/gui.cc:819
#, c-format
-#| msgid "s: %F"
msgid "%s: %s"
msgstr "%s: %s"
#: src/gtk/gui.cc:822
#, c-format
-#| msgid "No broken packages."
msgid "Error in package %s"
msgstr "Error en el paquete %s"
#: src/gtk/gui.cc:850
#, c-format
-#| msgid "Unable to replace %s with new configuration file"
msgid "Asking whether to replace the configuration file %s"
msgstr "Preguntando si reemplazar el archivo de configuración %s"
@@ -4192,35 +3991,29 @@ msgid "Downloading packages"
msgstr "Descargando paquetes"
#: src/gtk/gui.cc:982
-#| msgid "No broken packages."
msgid "Broken packages"
msgstr "Paquetes rotos"
#: src/gtk/gui.cc:1015
-#| msgid "No broken packages."
msgid "Show broken packages"
msgstr "Mostrar paquetes rotos"
#: src/gtk/gui.cc:1019
-#| msgid "Resolve Dependencies"
msgid "Resolve dependencies"
msgstr "Resolver las dependencias"
#: src/gtk/gui.cc:1047
#, c-format
-#| msgid "No packages are broken."
msgid "%d package is broken"
msgid_plural "%d packages are broken."
msgstr[0] "El paquete %d está roto."
msgstr[1] "Los paquetes %d están rotos."
#: src/gtk/gui.cc:1091
-#| msgid "%s changes"
msgid "View changes"
msgstr "Ver cambios"
#: src/gtk/gui.cc:1095
-#| msgid "%s changes"
msgid "Apply changes"
msgstr "Aplicar cambios"
@@ -4249,7 +4042,6 @@ msgstr[1] "No se pudo eliminar %s"
#: src/gtk/gui.cc:1190
#, c-format
-#| msgid "DownloadSize"
msgid "Download size: %sB."
msgstr "TamDescarga: %sB."
@@ -4263,15 +4055,25 @@ msgid "This feature is not implemented, yet."
msgstr "Ésta capacidad no está implementada, por ahora."
#: src/gtk/gui.cc:1299
-#| msgid "not installed"
msgid "Not implemented"
msgstr "No implementado"
#: src/gtk/gui.cc:1351 src/gtk/gui.cc:1370
-#| msgid "Installed"
msgid "Install/Upgrade"
msgstr "Instalar/Actualizar"
+#: src/gtk/gui.cc:1377
+msgid "Purge"
+msgstr "Purgar"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Mantener"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Retener"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4292,7 +4094,6 @@ msgid "Unable to load the user interface definition file %s/aptitude.glade."
msgstr ""
#: src/gtk/info.cc:160 src/gtk/pkgview.cc:169
-#| msgid "Current status: %F."
msgid "Current status"
msgstr "Estado actual"
@@ -4301,17 +4102,14 @@ msgid "Selected status"
msgstr "Estado seleccionado"
#: src/gtk/info.cc:495
-#| msgid "Not Installed"
msgid "Not available"
msgstr "No disponible"
#: src/gtk/info.cc:540
-#| msgid "C^ycle Package Information"
msgid "Package information: version list"
msgstr "Información de paquete: lista de versiones"
#: src/gtk/info.cc:550
-#| msgid "Packages being deleted due to broken dependencies"
msgid "Package information: dependency list"
msgstr "Información de paquete: lista de dependencias"
@@ -4333,132 +4131,116 @@ msgstr "no"
msgid "Unknown"
msgstr "Desconocido"
-#: src/gtk/packagestab.cc:60
+#: src/gtk/packagestab.cc:61
msgid "Parse error"
msgstr ""
-#: src/gtk/packagestab.cc:203
+#: src/gtk/packagestab.cc:204
#, c-format
-#| msgid "No packages matched the pattern \"%ls\"."
msgid "No packages matched \"%s\"."
msgstr "Ningún paquete concuerda con el patrón «%s»."
-#: 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
-#| msgid "Package: "
+#: src/gtk/packagestab.cc:416
msgid "Packages: "
msgstr "Paquetes: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s versiones"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Instalar(%s que provee %s)"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, c-format
-#| msgid " cwidget version: %s\n"
msgid "Downgrade to %s version %s"
msgstr "Desactualizar %s desde la versión %s"
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, c-format
-#| msgid "Keep the following packages at their current version:"
msgid "Don't hold %s at its current version."
msgstr "No retener %s en su versión actual."
-#: 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
#, c-format
-#| msgid "Canc^el pending actions"
msgid "Cancel any actions on %s."
msgstr "Cancelar cualquier acción sobre %s."
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, c-format
-#| msgid "Cancel the removal of %F"
msgid "Cancel the purge of %s."
msgstr "Cancelar la purgación de %s."
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, c-format
-#| msgid "Cancel the removal of %F"
msgid "Cancel the removal of %s."
msgstr "Cancelar la eliminación de %s."
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, c-format
-#| msgid "Cancel the removal of %F"
msgid "Cancel the upgrade of %s."
msgstr "Cancelar la actualización de %s."
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, c-format
-#| msgid "Cancel the installation of %F"
msgid "Cancel the installation of %s."
msgstr "Cancelar la instalación de %s."
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, c-format
-#| msgid "Cancel the removal of %F"
msgid "Cancel the downgrade of %s."
msgstr "Cancelar la desactualización de %s."
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, c-format
-#| msgid "Cancel the installation of %F"
msgid "Cancel the reinstallation of %s."
msgstr "Cancelar la re-instalación de %s."
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, c-format
-#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Eliminar %s"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, c-format
-#| msgid "^Purge"
msgid "Purge %s"
msgstr "Purgar %s"
-#: src/gtk/packagestab.cc:591
+#: src/gtk/packagestab.cc:594
#, c-format
msgid "Hold %s at its current version."
msgstr "Retener %s en su versión actual."
-#: src/gtk/packagestab.cc:596
+#: src/gtk/packagestab.cc:599
#, c-format
-#| msgid "'&M' to mark packages as automatically installed"
msgid "Mark %s as automatically installed."
msgstr "Marca %s como instalado automáticamente."
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, c-format
-#| msgid "The package \"%s\" is manually installed.\n"
msgid "Mark %s as manually installed."
msgstr "Marca %s como instalado manualmente."
-#: src/gtk/packagestab.cc:643
+#: src/gtk/packagestab.cc:646
#, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
msgid "%s is a virtual package provided by:\n"
msgstr "%s es un paquete virtual proporcionado por:\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: "
@@ -4466,48 +4248,42 @@ msgstr "Paquete fuente: "
#: src/gtk/pkgview.cc:224
#, c-format
-#| msgid "%s; will be installed automatically"
msgid "%s was installed automatically."
msgstr "%s se instaló automáticamente."
#: src/gtk/pkgview.cc:227
#, c-format
-#| msgid "%s; will be installed automatically"
msgid "%s is being installed automatically."
msgstr "%s se instalará automáticamente."
#: src/gtk/pkgview.cc:235
#, c-format
-#| msgid "%s; will be installed automatically"
msgid "%s was installed manually."
msgstr "%s; se instaló manualmente."
#: src/gtk/pkgview.cc:238
#, c-format
-#| msgid "%s; will be installed automatically"
msgid "%s is being installed manually."
msgstr "%s; se esta instalando manualmente."
-#: src/gtk/pkgview.cc:399
+#: src/gtk/pkgview.cc:401
msgid "Cache reloading, please wait..."
msgstr "Cargando almacén espere por favor..."
-#: src/gtk/pkgview.cc:604
-#| msgid "Search"
+#: src/gtk/pkgview.cc:607
msgid "Searching..."
msgstr "Buscando..."
-#: src/gtk/pkgview.cc:715
-#| msgid "Building view"
+#: src/gtk/pkgview.cc:718
msgid "Finalizing view"
msgstr "Construyendo la vista"
-#: 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 "Construyendo la vista"
-#: 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 "
@@ -4523,7 +4299,7 @@ msgstr ""
" La presencia de este árbol probablemente indica que algo está estropeado, "
"obien en su sistema o en el archivo de 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 "
@@ -4535,7 +4311,7 @@ msgstr ""
"satisfacer dependencias, y las acciones planeadas harán que ningún paquete "
"instalado dependa de ellos de forma imperativa.\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 "
@@ -4545,7 +4321,7 @@ msgstr ""
" Estos paquetes podrían ser actualizados, pero se conservan en su estado "
"actual para no romper ninguna dependencia."
-#: 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 "
@@ -4555,7 +4331,7 @@ msgstr ""
" Estos paquetes se instalarán porque algún paquete seleccionado para "
"instalar los necesita."
-#: 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 "
@@ -4566,7 +4342,7 @@ msgstr ""
"disponibles por más tiempo, o porque otro paquete crea un conflicto con "
"ellos."
-#: 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 "
@@ -4575,7 +4351,7 @@ msgstr ""
"Paquetes que se rebajarán de versión\n"
" Se instalará un versión anterior a la instalada de estos paquetes."
-#: 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 "
@@ -4585,7 +4361,7 @@ msgstr ""
" Pueden actualizarse los siguientes paquetes, pero usted ha pedido que se "
"mantengan en su versión actual."
-#: 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."
@@ -4593,7 +4369,7 @@ msgstr ""
"Paquetes a reinstalar\n"
" Estos paquetes serán reinstalados."
-#: 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 "
@@ -4603,7 +4379,7 @@ msgstr ""
" Estos paquetes han sido seleccionados manualmente para que se instalen en "
"su ordenador."
-#: 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."
@@ -4612,7 +4388,7 @@ msgstr ""
" Estos paquetes han sido seleccionados manualmente para que sean "
"desinstalados."
-#: 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."
@@ -4620,7 +4396,7 @@ msgstr ""
"Paquetes a actualizar\n"
" Estos paquetes serán actualizados a una nueva versió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 "
@@ -4630,14 +4406,12 @@ msgstr ""
" Estos paquetes no están totalmente instalados y configurados , se intentará "
"completar su instalación."
-#: src/gtk/previewtab.cc:174
-#| msgid "Preview"
+#: src/gtk/previewtab.cc:179
msgid "Preview: "
msgstr "Previsualizar:"
#: src/gtk/resolver.cc:68
#, c-format
-#| msgid "Error while dumping resolver state"
msgid "Error in dependency resolver: %s"
msgstr "Error del solucionador: %s"
@@ -4650,117 +4424,116 @@ msgid ""
"%s"
msgstr ""
-#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275
+#: src/gtk/resolver.cc:207
+#, fuzzy
+#| msgid "Virtual Packages"
+msgid "Virtual package"
+msgstr "Paquetes virtuales"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Sin instalar"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, c-format
-#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Eliminar %s es rechazado."
-#: src/gtk/resolver.cc:337
+#: src/gtk/resolver.cc:377
#, c-format
-#| msgid "Cancel the installation of %F"
msgid "Canceling the installation of %s is rejected."
msgstr "Cancelar la instalación de %s es rechazado."
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, c-format
-#| msgid "Cancel the removal of %F"
msgid "Canceling the removal of %s is rejected."
msgstr "Cancelar la eliminación de %s es rechazado."
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, c-format
-#| msgid "Keep %F at version %s (%s)"
msgid "Keeping %s at version %s is rejected."
msgstr "Mantener %s en la versión %s es rechazado."
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, c-format
-#| msgid "Install(%s provides %s)"
msgid "Installing %s version %s is rejected."
msgstr "Instalar %s versión %s es rechazado."
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, c-format
-#| msgid " cwidget version: %s\n"
msgid "Downgrading %s to version %s is rejected."
msgstr "Desactualizar %s a la versión %s es rechazado."
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, c-format
-#| msgid "%s versions"
msgid "Upgrading %s to version %s is rejected."
msgstr "Actualizar %s a la versión %s es rechazado."
-#: 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] "Como procesar la acción seleccionada"
msgstr[1] "Como procesar las acciones seleccionadas"
-#: 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] "Ignorar soluciones que contengan esta acción."
msgstr[1] "Ignorar soluciones que contengan estas acciones."
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4770,7 +4543,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4781,190 +4554,192 @@ msgstr[1] ""
"Preferir siempre estas acciones por encima de alternativas no aceptadas "
"antes."
-#: 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 depende de %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 predepende de %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 sugiere %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 recomienda %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 tiene conflictos con %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 rompe %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 reemplaza %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 hace obsoleto a %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 "Eliminar los paquetes siguientes:"
-#: 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 "Instalar los paquetes siguientes:"
-#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781
-#| msgid "Remove the following packages:"
+#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848
msgid "Keep the following packages:"
msgstr "Mantener los siguientes paquetes:"
-#: 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 "Actualizar los paquetes siguientes:"
-#: 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 "Desactualizar los paquetes siguientes:"
-#: src/gtk/resolver.cc:1369 src/gtk/resolver.cc:1819
-#| msgid "Leave the following dependencies unresolved:%n"
+#: src/gtk/resolver.cc:1425 src/gtk/resolver.cc:1886
msgid "Leave the following dependencies unresolved:"
msgstr "Dejar las siguientes dependencias sin resolver:"
-#: 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 "Eliminar %F [%s (%s)]"
-#: src/gtk/resolver.cc:1451
+#: src/gtk/resolver.cc:1509
#, c-format
-#| msgid "Install %F [%s (%s)]"
msgid "Install %s [<big>%s</big> (%s)]"
msgstr "Instalar %s [<big>%s</big>(%s)]"
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, c-format
-#| msgid "Cancel the installation of %F"
msgid "Cancel the installation of %s"
msgstr "Cancelar la instalación de %s"
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, c-format
-#| msgid "Cancel the removal of %F"
msgid "Cancel the removal of %s"
msgstr "Cancelar la eliminación de %s"
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, c-format
-#| msgid "Keep %F at version %s (%s)"
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr "Mantener %s en la versión <big>%s</big> (%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 "Actualizar %F [%s (%s) -> %s (%s)]"
-#: src/gtk/resolver.cc:1481
+#: src/gtk/resolver.cc:1539
#, c-format
-#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr "Desactualizar %s [<big>%s<big> (%s) -> <big>%s<big> (%s)]"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
-#| msgid "Remove(%s)"
msgid "<b>Remove</b> %s"
msgstr "<b>Eliminar</b> %s"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Eliminar(%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 "Mantener %F en la versión %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 "Mantener %F en la versión %s (%s)"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %s"
+msgid "<b>Cancel</b> the installation of %s"
+msgstr "Cancelar la instalación de %s"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %s"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Cancelar la instalación de %s"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Instalar %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 "Instalar %F [%s (%s)]"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
-#| msgid " cwidget version: %s\n"
msgid "<b>Downgrade</b> %s to version %s"
msgstr "<b>Desactualizar</b> %s a la versión %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 " Versión de cwidget: %s\n"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
-#| msgid "%s versions"
msgid "<b>Upgrade</b> %s to version %s"
msgstr ""
-#: 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 versiones"
-#: src/gtk/resolver.cc:1586
+#: src/gtk/resolver.cc:1653
#, c-format
msgid "Leave %s unresolved"
msgstr "Dejar %s sin resolver"
-#: src/gtk/resolver.cc:1586
+#: src/gtk/resolver.cc:1653
#, c-format
msgid "leave %s unresolved"
msgstr "dejar %s sin resolver"
-#: src/gtk/resolver.cc:1654
+#: src/gtk/resolver.cc:1721
#, fuzzy, c-format
#| msgid "%d install"
#| msgid_plural "%d installs"
@@ -4973,7 +4748,7 @@ msgid_plural "%s installs"
msgstr[0] "%d instalación"
msgstr[1] "%d instalaciones"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4982,7 +4757,7 @@ msgid_plural "%s removes"
msgstr[0] "%d eliminación"
msgstr[1] "%d eliminaciones"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4991,7 +4766,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d mantenido"
msgstr[1] "%d mantenidos"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5000,7 +4775,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d actualización"
msgstr[1] "%d actualizaciones"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5009,7 +4784,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d desactualización"
msgstr[1] "%d desactualizaciones"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5017,38 +4792,33 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Auditar ^Recomendaciones"
msgstr[1] "Auditar ^Recomendaciones"
-#: src/gtk/resolver.cc:1975
-#| msgid "No more solutions."
+#: src/gtk/resolver.cc:2042
msgid "No solutions yet."
msgstr "No hay más soluciones."
-#: src/gtk/resolver.cc:1982
-#| msgid "Dependency handling"
+#: src/gtk/resolver.cc:2049
msgid "No dependency solution was found."
msgstr "No se encontró ninguna solución a las dependencias."
-#: src/gtk/resolver.cc:1983
-#| msgid "No more solutions."
+#: src/gtk/resolver.cc:2050
msgid "No solutions."
msgstr "No hay soluciones."
-#: src/gtk/resolver.cc:1994
+#: src/gtk/resolver.cc:2061
msgid "To view a solution, select it from the list to the right."
msgstr "Para ver una solución, seleccionela de la lista a la derecha."
-#: src/gtk/resolver.cc:1995
+#: src/gtk/resolver.cc:2062
#, c-format
-#| msgid "No more solutions."
msgid "%u solutions."
msgstr "%u soluciones."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
#: src/gtk/tab.cc:68
-#| msgid "[Downloaded]"
msgid "Download"
msgstr "Descarga"
@@ -5694,14 +5464,12 @@ msgstr "avisar"
#. ForTranslators: This is a log level that the user can pass on
#. the command-line or set in the configuration file.
#: src/main.cc:335
-#| msgid "Err "
msgid "error"
msgstr "error"
#. ForTranslators: This is a log level that the user can pass on
#. the command-line or set in the configuration file.
#: src/main.cc:338
-#| msgid "false"
msgid "fatal"
msgstr "fatal"
@@ -7900,6 +7668,75 @@ msgstr "Descargando registro de cambios"
msgid "Download Changelog"
msgstr "Descargar el registro de cambios"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Instalar/eliminar paquetes"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Actualizar la lista de paquetes"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Marcar ^actualizable"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Olvidar paquetes nuevos"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Cance^lar acciones pendientes"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Limpiar el almacén de paquetes"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Limpiar ficheros ^obsoletos"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Recargar el almacén de paquetes"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Jugar al buscaminas"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Convertirse en administrador"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Salir"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "eliminar"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Gestión de dependencias"
+
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "Ver una explicación de la solución"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(para %s)"
@@ -9166,9 +9003,6 @@ msgstr "Descargar el registro de cambios"
#~ msgid "Not Installed Packages"
#~ msgstr "Paquetes no instalados"
-#~ msgid "Virtual Packages"
-#~ msgstr "Paquetes virtuales"
-
#~ msgid "Obsolete and Locally Created Packages"
#~ msgstr "Paquetes obsoletos o creados localmente"
diff --git a/po/eu.po b/po/eu.po
index 4a210c17..bed16c0f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_po_eu\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-05 22:00+0200\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -651,8 +651,8 @@ msgstr "Errore konponezina atzitzean"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Mendekotasunak ebaztea"
-#: 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 "Barne-errorea: ustegabeko 'null' emaitza."
@@ -1725,7 +1725,7 @@ msgstr ""
"sortu."
#: 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 "Mendekotasunak ebazten..."
@@ -1832,7 +1832,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:\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>"
@@ -1968,8 +1968,8 @@ msgstr "Automatikoki instalatuta"
msgid "no"
msgstr "ez"
-#: 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 "Bertsioa: "
@@ -2048,12 +2048,12 @@ msgid "Obsoletes"
msgstr "Zaharkitzea:"
#: 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 "Hornitzen du:"
#: 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 "Azalpena: "
@@ -2208,8 +2208,7 @@ msgstr "Unekoa"
msgid "Candidate"
msgstr "Hautagarria"
-#: 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 "Instalatu"
@@ -2349,7 +2348,7 @@ msgstr "BETEGABEA"
msgid "UNAVAILABLE"
msgstr "EZ ERABILGARRIA"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Etiketak"
@@ -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 "Sekzioa"
-#: 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 "Egiteko dauden ekintzak utzi"
-#: 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 "'-' paketeak kentzeko"
-#: 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 "ez da benetako paketea"
-#: 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 "Kendu hurrengo paketeak:"
-#: 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 "
@@ -3138,99 +3137,45 @@ msgstr ""
msgid "_File"
msgstr "Faltsua"
-#: 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 "Instalatzeko/kentzeko dauden pakete guztiak instalatu/kendu"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Instalatu/kendu paketeak"
-
-#: 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 "Paketeen bertsio berririk dagoen begiratu"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Eguneratu pakete-zerrenda"
-
-#: 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 "Bertsio-berritu daitezkeen paketeak, atxikita ez daudenak, markatu"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Markatu ^Berritu daitekeena"
-
-#: 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 "Ahaztu zein diren pakete \"berriak\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Ahaztu pakete berriak"
-
-#: 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 ""
"Instalatzeko, kentzeko, hizozteko edo bertsio berritzeko dauden pakete "
"guztiak utzi."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Egiteko dauden ekintzak utzi"
-
-#: 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 "Lehen deskargatutako pakete-fitxategiak ezabatu"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Garbitu paketeen cachea"
-
-#: 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 "Jada deskargatu ezin diren pakete-fitxategiak ezabatu"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Garbitu fitxategi ^zaharkituak"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Paketeen cachea birkargatu."
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Birkargatu pakete-cachea"
-
-#: 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 "Denbora pasa mina bila"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Jokatu mina-aurkitzailean"
-
-#: 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"
@@ -3238,261 +3183,200 @@ msgstr ""
"Root bihurtzeko, exekutatu 'su'. Horrela programa berrabiaraziko da, baina "
"zure ezarpenak mantenduta."
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Root bihurtu"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Irten programatik"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Irten"
-
-#: 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 "Azken pakete-eragiketa edo eragiketa-multzoa desegin"
-#: 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 "ezabatu"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paketea"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Ikuspegiak"
-#: 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 "Mendekotasun kudeaketa"
-
-#: 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 "ezabatu"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Laguntza"
-#: 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 "Zerrendaren eguneraketa"
-#: 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 "Paketeak"
-#: 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 "Aurrebista"
-#: 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 "Ebatzi"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Instalatuta"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Kendu"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Purgatu"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Mantendu"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Heldu"
-
-#: 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 "Kendu iragazkia pakete-zerrendari"
-#: 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 "Ezarri iragazkia pakete-zerrendari"
-#: 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 "ezabatu"
+
+#: 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 "Bilatu"
-#: 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 "berrinstalatu"
-#: 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 "Err "
-#: 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 - mendekotasunak"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Aldaketa-egunkaria"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Faltsua"
-#: 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 "Etiketak"
-#: 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 "Egoera"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Ekintza mota ezezaguna: %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 "
@@ -3501,148 +3385,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 "Ekintza mota ezezaguna: %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 "Txandakatu ^baztertutakoa"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Hobespenak"
-#: 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 "Egoera"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Aztertu irtenbidea"
-#: 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 "Hautatu hurrengo irtenbidea (mendekotasun arazoarena)."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Aztertu irtenbidea"
+#: 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 "Landu ekintzak (irtenbidearen uneko hautapenean daudenak)."
-#: 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 "Bertsio-berritu"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Iturburu-paketea: "
-#: 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 "Eskuliburua"
-#: 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 "Bertsio-berritu"
-#: 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 "bai"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3697,21 +3564,21 @@ msgstr "Aldaketen egunkaria deskargatzen"
msgid "Downloading changelogs"
msgstr "Aldaketen egunkaria deskargatzen"
-#: 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 "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
-#: 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"
@@ -3720,19 +3587,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d eguneratu"
msgstr[1] "%d eguneratu"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Ez dago instalatuta"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Ezin da %s paketea aurkitu"
-#: 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 "
@@ -3743,7 +3610,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3754,49 +3621,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Barne-errorea: zutabe-kate lehenetsia ez da analizagarria"
-#: 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 "Mendekotasun kudeaketa"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Mendekotasun kudeaketa"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Mendekotasun kudeaketa"
-#: 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."
@@ -4061,6 +3928,10 @@ msgstr "Berrinstalatu"
msgid "Downgrade"
msgstr "Itzuli aurreko bertsiora"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Kendu"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4258,6 +4129,20 @@ msgstr "ez dago instalatuta"
msgid "Install/Upgrade"
msgstr "Instalatuta"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Purgatu"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Mantendu"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Heldu"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4323,133 +4208,133 @@ msgstr "ez"
msgid "Unknown"
msgstr "Ezezaguna"
-#: 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 "Ez dago \"%ls\" patroia betetzen duen paketerik."
-#: 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 "Paketea: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s - bertsioak"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Instalatu: (%s-ek %s hornitzen du)"
-#: 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 bertsioa: %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 "Mantendu hurrengo paketeak dauden bezala:"
-#: 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 "Egiteko dauden ekintzak utzi"
-#: 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 "Bertanb behera utzi %F kentzea"
-#: 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 "Bertanb behera utzi %F kentzea"
-#: 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 "Bertanb behera utzi %F kentzea"
-#: 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 "Bertan behera utzi %F(r)en instalazioa"
-#: 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 "Bertanb behera utzi %F kentzea"
-#: 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 "Bertan behera utzi %F(r)en instalazioa"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Kendu(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Purgatu"
-#: 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' markatu automatikoki instalatu izan diren paketeak"
-#: 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\" paketea eskuz instalaturik dago.\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\" pakete birtual bat da, honek hornitua:\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: "
@@ -4479,28 +4364,28 @@ msgstr "%s; automatikoki instalatu egingo da"
msgid "%s is being installed manually."
msgstr "%s; automatikoki instalatu egingo da"
-#: 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 "Bilatu"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Ikuspegi-eraikitzea"
-#: 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 "Ikuspegi-eraikitzea"
-#: 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 "
@@ -4516,7 +4401,7 @@ msgstr ""
" Zuhaitz hau agertzeak seguru asko esan nahi izango du, zerbait hautsita "
"dagoela zure sisteman edo Debian artxiboan."
-#: 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 "
@@ -4529,7 +4414,7 @@ msgstr ""
"instalatutako pakete bat ere geratuko horien mendekotasun "
"'garrantzitsua'duenik.\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 "
@@ -4539,7 +4424,7 @@ msgstr ""
" Pakete hauek bertsio-berritu litezke, baina uneko egoeran mantenduko dira, "
"mendekotasunik ez hausteko."
-#: 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 "
@@ -4549,7 +4434,7 @@ msgstr ""
" Instalatzeko aukeratu duzun beste pakete batek behar dituelako instalatuko "
"dira pakete hauek."
-#: 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 "
@@ -4559,7 +4444,7 @@ msgstr ""
" Euren mendekotasun bat edo gehiago jada erabilgarri ez dagoelako, edo beste "
"pakete batekin gatazka dutelako ezabatuko dira pakete hauek."
-#: 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 "
@@ -4569,7 +4454,7 @@ msgstr ""
" Une honetan instalatutakoa baino bertsio zaharrago batera itzuliko dira "
"pakete hauek."
-#: 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 "
@@ -4579,7 +4464,7 @@ msgstr ""
" Pakete hauek bertsio-berritu daitezke, baina uneko bertsioan mantentzea "
"eskatu duzu."
-#: 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."
@@ -4587,7 +4472,7 @@ msgstr ""
"Berrinstalatzeko paketeak\n"
" Pakete hauek berriro instalatuko dira."
-#: 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 "
@@ -4596,7 +4481,7 @@ msgstr ""
"Instalatzeko paketeak\n"
" Pakete hauek eskuz hautatu dituzu, ordenagailuan instalatzeko."
-#: 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."
@@ -4604,7 +4489,7 @@ msgstr ""
"Kentzeko paketeak\n"
" Pakete hauek eskuz hautatu dituzu kentzeko."
-#: 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."
@@ -4612,7 +4497,7 @@ msgstr ""
"Bertsio-berritzeko paketeak\n"
" Pakete hauek bertsio-berritu egingo dira."
-#: 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 "
@@ -4622,7 +4507,7 @@ msgstr ""
" Pakete hauek ez daude guztiz instalatu eta konfiguraturik, instalazio hau "
"burutzeko saiakera bat egingo da orain."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4643,117 +4528,123 @@ 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 "Paketea"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Ez dago instalatuta"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "%s kentzen"
-#: 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 "Bertan behera utzi %F(r)en instalazioa"
-#: 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 "Bertanb behera utzi %F kentzea"
-#: 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 "Mantendu %F %s bertsioan (%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 "Instalatu: (%s-ek %s hornitzen du)"
-#: 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 bertsioa: %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 - bertsioak"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4763,7 +4654,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4771,192 +4662,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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-ek %s-ren mendekotasuna du."
-#: 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-ek %s-ren aurre-mendekotasuna du."
-#: 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-ek %s iradokitzen du"
-#: 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-ek %s gomendatzen du"
-#: 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-ek %s-rekin elkar-jotzen du"
-#: 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-ek %s hausten du"
-#: 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-ek %s ordezkatzen du"
-#: 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-ek %s zaharkiturik uzten du"
-#: 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 "Kendu hurrengo paketeak:"
-#: 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 "Instalatu hurrengo bertsio-beritzeak:"
-#: 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 "Kendu hurrengo paketeak:"
-#: 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 "Bertsio-berritu hurrengo paketeak:"
-#: 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 "Bertsioa atzeratu hurrengo paketeetan:"
-#: 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 "Utzi honako mendekotasunak ebatzi gabe:%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 "Kendu %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 "Instalatu %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 "Bertan behera utzi %F(r)en instalazioa"
-#: 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 "Bertanb behera utzi %F kentzea"
-#: 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 "Mantendu %F %s bertsioan (%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 "Eguneratu %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 "Bertsio-zahartu %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 "Kendu(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Kendu(%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 "Mantendu %F %s bertsioan (%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 "Mantendu %F %s bertsioan (%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 "Bertan behera utzi %F(r)en instalazioa"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Bertan behera utzi %F(r)en instalazioa"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Instalatu %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 "Instalatu %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 bertsioa: %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 bertsioa: %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 - bertsioak"
-#: 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 - bertsioak"
-#: 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"
@@ -4965,7 +4868,7 @@ msgid_plural "%s installs"
msgstr[0] "%d instalatu"
msgstr[1] "%d instalatu"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4974,7 +4877,7 @@ msgid_plural "%s removes"
msgstr[0] "%d kendu"
msgstr[1] "%d kendu"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4983,7 +4886,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d mantendu"
msgstr[1] "%d mantendu"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4992,7 +4895,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d eguneratu"
msgstr[1] "%d eguneratu"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5001,7 +4904,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d aurreko bertsiora itzuli"
msgstr[1] "%d aurreko bertsiora itzuli"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5009,35 +4912,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "^Gomendioak Auditatu:"
msgstr[1] "^Gomendioak Auditatu:"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Ez dago irtenbide gehiagorik."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Mendekotasun kudeaketa"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Ez dago irtenbide gehiagorik."
-#: 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 "Ez dago irtenbide gehiagorik."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7869,6 +7772,71 @@ msgstr "Aldaketen egunkaria deskargatzen"
msgid "Download Changelog"
msgstr "Deskargatu erregistro aldaketak"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Instalatu/kendu paketeak"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Eguneratu pakete-zerrenda"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Markatu ^Berritu daitekeena"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Ahaztu pakete berriak"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Egiteko dauden ekintzak utzi"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Garbitu paketeen cachea"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Garbitu fitxategi ^zaharkituak"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Birkargatu pakete-cachea"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Jokatu mina-aurkitzailean"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Root bihurtu"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Irten"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "ezabatu"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Mendekotasun kudeaketa"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(%s)"
diff --git a/po/fi.po b/po/fi.po
index 6b8e5a0a..bd86d411 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.4\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: 2006-11-05 15:47+0200\n"
"Last-Translator: Jaakko Kangasharju <ashar@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -528,8 +528,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Selvitän riippuvuuksia"
-#: 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 "Ohjelmavirhe: odottamaton tyhjä ratkaisu."
@@ -1580,7 +1580,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "Selvitän riippuvuuksia..."
@@ -1683,7 +1683,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:\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>"
@@ -1819,8 +1819,8 @@ msgstr "Automaattisesti asennettu"
msgid "no"
msgstr "ei"
-#: 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 "Versio: "
@@ -1899,12 +1899,12 @@ msgid "Obsoletes"
msgstr "Täydet korvaavuudet"
#: 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 "Katetut"
#: 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 "Kuvaus: "
@@ -2060,8 +2060,7 @@ msgstr ""
msgid "Candidate"
msgstr "Ehd.ver"
-#: 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 "Asennus"
@@ -2201,7 +2200,7 @@ msgstr "TYYDYTTÄMÄTÖN"
msgid "UNAVAILABLE"
msgstr "EI SAATAVILLA"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Merkit"
@@ -2471,54 +2470,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 "Ryhmä"
-#: 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 "^Peruuta komennot"
-#: 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 "'-' poistaaksesi paketteja"
-#: 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 "ei oikea paketti"
-#: 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 "Poista paketit:"
-#: 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 "
@@ -2964,98 +2963,44 @@ msgstr ""
msgid "_File"
msgstr "Lopeta"
-#: 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 "Suorita kaikki määritetyt asennukset ja poistot"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Asenna/poista paketteja"
-
-#: 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 "Päivitä saatavilla olevien pakettien luettelo"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Päivitä pakettiluettelo"
-
-#: 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 ""
"Merkitse päivitettäväksi kaikki päivityskelpoiset ei-jäädytetyt paketit"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "^Merkitse päivitykset"
-
-#: 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 "Tyhjennä uusien pakettien ryhmä"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Unohda uudet paketit"
-
-#: 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 "Peruuta kaikki määritetyt asennukset ja poistot"
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "^Peruuta komennot"
-
-#: 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 "Poista aiemmin noudetut pakettitiedostot"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Puhdista ^koko pakettivarasto"
-
-#: 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 "Poista pakettitiedostot, joita ei enää voi noutaa"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Puhdista ^vanhentuneet tiedostot"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Lataa pakettivarasto uudelleen muistiin."
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "Lataa ^pakettivarasto uudelleen"
-
-#: 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 "Hukkaa aikaa etsimällä miinoja"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Pelaa miina^haravaa"
-
-#: 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"
@@ -3063,259 +3008,199 @@ msgstr ""
"Vaihda root-tunnukselle komennolla 'su'. Tämä käynnistää ohjelman "
"uudelleen, mutta asetuksesi säilyvät nykyisellään."
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Vaihda root-tunnukselle"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Poistu ohjelmasta"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Lopeta"
-
-#: 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 "Peruuta viimeisin suoritettu toimi tai toimiryhmä"
-#: 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 "poistettu"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paketti"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Näkymät"
-#: 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 "Find _Dependency Chains"
-msgstr "^Riippuvuuksien käsittely"
-
-#: 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 "poistettu"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Apu"
-#: 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 "Luettelopäivitys"
-#: 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 "Paketit"
-#: 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 "Esikatselu"
-#: 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 "Ratkaisin"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Asennettu"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Poisto"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Siivoa"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Säilytys"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Jäädytys"
-
-#: 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 "Poista pakettiluettelon suodatin"
-#: 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 "Rajoita näkyvien pakettien luetteloa suodattimella"
-#: 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 "poistettu"
+
+#: 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 "Haku"
-#: 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 "asenna uudelleen"
-#: 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 "Virhe "
-#: 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:n riippuvuudet"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "Muutos^loki"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
msgid "Files"
msgstr "Lopeta"
-#: 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 "Merkit"
-#: 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 "Tila"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Tuntematon toimi: %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 "
@@ -3324,149 +3209,130 @@ 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 "Tuntematon toimi: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "näytä ratkaisun tekemät muutokset"
-
-#: 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 "Hylkäys"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
msgid "No preference"
msgstr "Esiriippuvuudet"
-#: 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 "Tila"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Näytä ratkaisu"
-#: 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 "Näytä seuraava ratkaisu riippuvuusongelmiin."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Näytä ratkaisu"
+#: 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 "Toteuta valitun ratkaisun toimenpiteet."
-#: 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 "Päivitys"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Lähdekoodipaketti: "
-#: 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 "Opas"
-#: 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 "Päivitys"
-#: 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 "on"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3519,21 +3385,21 @@ msgstr "Noudan muutoslokia"
msgid "Downloading changelogs"
msgstr "Noudan muutoslokia"
-#: 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 josta muutoslokit noudetaan"
-#: 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"
@@ -3542,19 +3408,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d päivitys"
msgstr[1] "%d päivitystä"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Ei asennettu"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "En löytänyt pakettia %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 "
@@ -3565,7 +3431,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3576,46 +3442,46 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Sisäinen virhe: Sarakejonoa ei voi jäsentää"
-#: 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 "Find dependency chains: start"
msgstr "^Riippuvuuksien käsittely"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
msgid "Find dependency chains: end"
msgstr "^Riippuvuuksien käsittely"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
msgid "Find dependency chains: results"
msgstr "^Riippuvuuksien käsittely"
-#: 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 "No dependency chain found."
msgstr "^Riippuvuuksien käsittely"
@@ -3874,6 +3740,10 @@ msgstr "Uudelleenasennus"
msgid "Downgrade"
msgstr "Vanhennus"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Poisto"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4068,6 +3938,20 @@ msgstr "ei asennettu"
msgid "Install/Upgrade"
msgstr "Asennettu"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Siivoa"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Säilytys"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Jäädytys"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4129,129 +4013,129 @@ msgstr "ei"
msgid "Unknown"
msgstr "Tuntematon"
-#: 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 "Mikään paketti ei täsmännyt hakuehtoon \"%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 "Paketti: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s: versiot"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
msgid "Install %s version %s"
msgstr "Asennan paketin %s %s (%s)"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "libsigc++-versio: %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 "Säilytä paketit nykyisessä versiossaan:"
-#: 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 "^Peruuta komennot"
-#: 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 "Peruuta %F:n poisto"
-#: 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 "Peruuta %F:n poisto"
-#: 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 "Peruuta %F:n poisto"
-#: 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 "Peruuta %F:n asennus"
-#: 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 "Peruuta %F:n poisto"
-#: 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 "Peruuta %F:n asennus"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
msgid "Remove %s"
msgstr "Poisto"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Siivoa"
-#: 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' merkitäksesi paketteja automaattisesti asennetuiksi"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr "'&m' merkitäksesi paketteja käsin asennetuiksi"
-#: 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\" on näennäispaketti, jonka kattaa\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: "
@@ -4281,28 +4165,28 @@ msgstr "%s; asennetaan automaattisesti"
msgid "%s is being installed manually."
msgstr "%s; asennetaan automaattisesti"
-#: 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 "Haku"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Rakennan näkymää"
-#: 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 "Rakennan näkymää"
-#: 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 "
@@ -4315,7 +4199,7 @@ msgstr ""
" Näiden pakettien riippvuuksia ei voi tyydyttää. Tämä yleensä merkitsee, "
"että jotain on rikki, joko omassa järjestelmässäsi tai Debianin arkistossa."
-#: 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 "
@@ -4327,7 +4211,7 @@ msgstr ""
"riippuvuuksia tyydyttääkseen, ja halutun toimenpiteen jälkeen näihin "
"paketteihin ei ole enää 'tärkeitä' riippuvuuksia.\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 "
@@ -4337,7 +4221,7 @@ msgstr ""
" Näille paketeille on olemassa uudempi versio, mutta ne jäädytetään "
"nykyiseen versioonsa, jotta riippuvuudet eivät rikkoontuisi."
-#: 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 "
@@ -4347,7 +4231,7 @@ msgstr ""
" Nämä paketit asennetaan, koska jokin asennettavaksi valitsemasi paketti "
"riippuu niistä."
-#: 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 "
@@ -4357,7 +4241,7 @@ msgstr ""
" Nämä paketit poistetaan, koska jokin niiden riippuvuuksista ei ole enää "
"saatavilla, tai koska jokin toinen paketti on ristiriidassa niiden kanssa."
-#: 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 "
@@ -4367,7 +4251,7 @@ msgstr ""
" Näistä paketeista asennetaan vanhempi versio kuin tällä hetkellä "
"asennettuna oleva."
-#: 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 "
@@ -4376,7 +4260,7 @@ msgstr ""
"Jäädytetyt paketit\n"
" Näille paketeille on olemassa uudempi versio, mutta olet jäädyttänyt ne."
-#: 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."
@@ -4384,7 +4268,7 @@ msgstr ""
"Uudelleenasennettavat paketit\n"
" Nämä paketit asennetaan uudelleen."
-#: 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 "
@@ -4393,7 +4277,7 @@ msgstr ""
"Asennettavat paketit\n"
" Nämä paketit on käsin valittu asennettaviksi."
-#: 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."
@@ -4401,7 +4285,7 @@ msgstr ""
"Poistettavat paketit\n"
" Nämä paketit on käsin valittu poistettaviksi."
-#: 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."
@@ -4409,7 +4293,7 @@ msgstr ""
"Päivitettävät paketit\n"
" Nämä paketit päivitetään uudempaan versioon."
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4420,7 +4304,7 @@ msgstr ""
" Nämä paketit asennetaan, koska jokin asennettavaksi valitsemasi paketti "
"riippuu niistä."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4441,115 +4325,121 @@ msgid ""
"%s"
msgstr ""
-#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275
+#: src/gtk/resolver.cc:207
+#, fuzzy
+#| msgid "Virtual Packages"
+msgid "Virtual package"
+msgstr "Näennäispaketit"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Ei asennettu"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Poistan paketin %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 "Peruuta %F:n asennus"
-#: 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 "Peruuta %F:n poisto"
-#: 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 "Säilytä %F versiossa %s (%s)"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
msgid "Installing %s version %s is rejected."
msgstr "Asennan paketin %s %s (%s)"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "libsigc++-versio: %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: versiot"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4559,7 +4449,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4567,188 +4457,200 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 riippuu %s:sta"
-#: 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 esiriippuu %s:sta"
-#: 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 ehdottaa %s:a"
-#: 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 suosittelee %s:a"
-#: 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 on ristiriidassa %s:n kanssa"
-#: src/gtk/resolver.cc:1187 src/solution_fragment.cc:123
+#: src/gtk/resolver.cc:1241 src/solution_fragment.cc:123
#, fuzzy, c-format
msgid "%s breaks %s"
msgstr "%s korvaa %s:n"
-#: 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 korvaa %s:n"
-#: 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 korvaa täysin %s:n"
-#: 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 "Poista paketit:"
-#: 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 "Asenna paketit:"
-#: 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 "Poista paketit:"
-#: 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 "Päivitä paketit:"
-#: 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 "Vanhenna paketit:"
-#: 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 "Jätä riippuvuudet selvittämättä:%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 "Poista %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 "Asenna %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 "Peruuta %F:n asennus"
-#: 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 "Peruuta %F:n poisto"
-#: 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 "Säilytä %F versiossa %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 "Päivitä %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 "Vanhenna %F [%s (%s) -> %s (%s)]"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>Remove</b> %s"
msgstr "Poisto"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "Poisto"
-#: 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 "Säilytä %F versiossa %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 "Säilytä %F versiossa %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 "Peruuta %F:n asennus"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Peruuta %F:n asennus"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Asenna %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 "Asenna %F [%s (%s)]"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "libsigc++-versio: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "libsigc++-versio: %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: versiot"
-#: 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: versiot"
-#: 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"
@@ -4757,7 +4659,7 @@ msgid_plural "%s installs"
msgstr[0] "%d asennus"
msgstr[1] "%d asennusta"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4766,7 +4668,7 @@ msgid_plural "%s removes"
msgstr[0] "%d poisto"
msgstr[1] "%d poistoa"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4775,7 +4677,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d säilytys"
msgstr[1] "%d säilytystä"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4784,7 +4686,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d päivitys"
msgstr[1] "%d päivitystä"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4793,7 +4695,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d vanhennus"
msgstr[1] "%d vanhennusta"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4801,34 +4703,34 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Näytä ^suosittelut"
msgstr[1] "Näytä ^suosittelut"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Ei muita ratkaisuja"
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
msgid "No dependency solution was found."
msgstr "^Riippuvuuksien käsittely"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Ei muita ratkaisuja"
-#: 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 "Ei muita ratkaisuja"
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7633,6 +7535,75 @@ msgid "Download Changelog"
msgstr "Nouda muutosloki"
#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Asenna/poista paketteja"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Päivitä pakettiluettelo"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "^Merkitse päivitykset"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Unohda uudet paketit"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "^Peruuta komennot"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Puhdista ^koko pakettivarasto"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Puhdista ^vanhentuneet tiedostot"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "Lataa ^pakettivarasto uudelleen"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Pelaa miina^haravaa"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Vaihda root-tunnukselle"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Lopeta"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "poistettu"
+
+#, fuzzy
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "^Riippuvuuksien käsittely"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "näytä ratkaisun tekemät muutokset"
+
+#, fuzzy
#~ msgid "Dependency Chain"
#~ msgstr "^Riippuvuuksien käsittely"
@@ -8845,8 +8816,5 @@ msgstr "Nouda muutosloki"
#~ msgid "Obsolete and Locally Created Packages"
#~ msgstr "Vanhentuneet ja itsetehdyt paketit"
-#~ msgid "Virtual Packages"
-#~ msgstr "Näennäispaketit"
-
#~ msgid "Packages being held back"
#~ msgstr "Jäädytetyt paketit"
diff --git a/po/fr.po b/po/fr.po
index c18df952..1e8f4a0e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \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: 2009-05-29 19:03+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -656,8 +656,8 @@ msgstr "Erreur fatale du solveur"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Résolution des dépendances"
-#: 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 "Erreur interne : solution « null » inattendue."
@@ -1757,7 +1757,7 @@ msgstr ""
"dépendances n'a été créé."
#: 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 "Résolution des dépendances..."
@@ -1866,7 +1866,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Les paquets suivants ont des dépendances non satisfaites :\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>"
@@ -2000,8 +2000,8 @@ msgstr "Automatiquement installé"
msgid "no"
msgstr "non"
-#: 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 "Version : "
@@ -2080,12 +2080,12 @@ msgid "Obsoletes"
msgstr "Rend obsolète"
#: 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 "Fournit"
#: 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 "Description : "
@@ -2243,8 +2243,7 @@ msgstr "Courant(e)"
msgid "Candidate"
msgstr "Candidat(e)"
-#: 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 "Installer"
@@ -2383,7 +2382,7 @@ msgstr "NON SATISFAIT(E)"
msgid "UNAVAILABLE"
msgstr "INDISPONIBLE"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Étiquettes"
@@ -2673,7 +2672,7 @@ msgstr ""
"Astuce « %s » non valable : l'action « %s » devrait être « approve », « reject » "
"ou un nombre."
-#: 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)."
@@ -2681,31 +2680,31 @@ msgstr ""
"« tier » « %s » de recherche non valable (n'est ni « conflict », ni « minimum » "
"ni un entier)."
-#: src/generic/apt/aptitude_resolver_universe.cc:871
+#: src/generic/apt/aptitude_resolver_universe.cc:878
msgid "Safe actions"
msgstr "Actions sûres"
-#: src/generic/apt/aptitude_resolver_universe.cc:872
+#: src/generic/apt/aptitude_resolver_universe.cc:879
msgid "Cancel all user actions"
msgstr "Annuler toutes les actions utilisateur"
-#: src/generic/apt/aptitude_resolver_universe.cc:873
+#: src/generic/apt/aptitude_resolver_universe.cc:880
msgid "Remove packages"
msgstr "Supprimer des paquets"
-#: src/generic/apt/aptitude_resolver_universe.cc:874
+#: src/generic/apt/aptitude_resolver_universe.cc:881
msgid "Modify held packages"
msgstr "Modifier des paquets gardés"
-#: src/generic/apt/aptitude_resolver_universe.cc:875
+#: src/generic/apt/aptitude_resolver_universe.cc:882
msgid "Install versions from non-default sources"
msgstr "Installer des versions issues de sources autres que par défaut"
-#: src/generic/apt/aptitude_resolver_universe.cc:876
+#: src/generic/apt/aptitude_resolver_universe.cc:883
msgid "Remove essential packages"
msgstr "Supprimer des paquets essentiels"
-#: 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 "
@@ -2714,7 +2713,7 @@ msgstr ""
"Le « tier » « %s », configuré dans %s::ProblemResolver::Tier-Names n'a pas "
"d'entrée Tier »."
-#: 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 "
@@ -3183,84 +3182,48 @@ msgstr "Gestionnaire de paquets Aptitude"
msgid "_File"
msgstr "_Fichier"
-#: 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 ""
"Effectuer toutes les actions d'installation ou de suppression demandées"
-#: src/gtk/aptitude.glade:27
-msgid "_Install/Remove Packages"
-msgstr "_Installer/enlever des paquets"
-
-#: 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 "Vérifier s'il existe de nouvelles versions des paquets"
-#: src/gtk/aptitude.glade:43
-msgid "_Update Package List"
-msgstr "_Mettre à jour les listes de paquets"
-
-#: 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 ""
"Marquer pour mise à jour tous les paquets susceptibles d'être mis à jour et "
"qui ne sont pas gelés"
-#: src/gtk/aptitude.glade:64
-msgid "Mark Up_gradable"
-msgstr "Marquer comme étant susceptible de mise à _jour"
-
-#: 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 "Oublier quels paquets sont « nouveaux »"
-#: src/gtk/aptitude.glade:80
-msgid "_Forget New Packages"
-msgstr "_Oublier quels paquets sont nouveaux"
-
-#: 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 ""
"Abandonner toutes les installations, suppressions, gels de paquets et mises "
"à jour en attente"
-#: src/gtk/aptitude.glade:95
-msgid "Canc_el Pending Actions"
-msgstr "Annu_ler les actions en attente"
-
-#: 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 "Effacer les fichiers de paquets précédemment téléchargés"
-#: src/gtk/aptitude.glade:110
-msgid "C_lean Package Cache"
-msgstr "_Nettoyer le cache des paquets"
-
-#: 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 "Effacer les fichiers des paquets qui ne peuvent plus être téléchargés"
-#: src/gtk/aptitude.glade:125
-msgid "Clean _Obsolete Files"
-msgstr "Enlever les fichiers _périmés"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Recharger le cache des paquets"
-#: src/gtk/aptitude.glade:145
-msgid "_Reload Package Cache"
-msgstr "_Recharger le cache des paquets"
-
-#: 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 "Passer le temps en essayant de trouver les mines"
-#: src/gtk/aptitude.glade:160
-msgid "_Play Minesweeper"
-msgstr "Jouer au _démineur"
-
-#: 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"
@@ -3268,63 +3231,31 @@ msgstr ""
"Utilisez la commande « su » pour devenir administrateur. Cela relancera le "
"programme mais vos préférences seront conservées"
-#: src/gtk/aptitude.glade:180
-msgid "_Become Root"
-msgstr "Devenir _superutilisateur"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Quitter le programme"
-#: src/gtk/aptitude.glade:195
-msgid "_Quit"
-msgstr "_Quitter"
-
-#: src/gtk/aptitude.glade:212
+#: src/gtk/aptitude.glade:147
msgid "E_dit"
msgstr "_Édition"
-#: 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 "Annuler la dernière opération ou groupe d'opérations sur les paquets"
-#: src/gtk/aptitude.glade:221
-msgid "gtk-undo"
-msgstr "gtk-undo"
-
-#: src/gtk/aptitude.glade:234
-msgid "gtk-cut"
-msgstr "gtk-cut"
-
-#: src/gtk/aptitude.glade:242
-msgid "gtk-copy"
-msgstr "gtk-copy"
-
-#: src/gtk/aptitude.glade:250
-msgid "gtk-paste"
-msgstr "gtk-paste"
-
-#: src/gtk/aptitude.glade:258
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
msgid "_Package"
msgstr "_Paquet"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
msgid "_View"
msgstr "_Vues"
-#: src/gtk/aptitude.glade:290
+#: src/gtk/aptitude.glade:226
msgid "Change which columns are visible in the currently active view."
msgstr "Modifie les colonnes visibles dans la vue active courante"
-#: src/gtk/aptitude.glade:291
-msgid "_Edit Columns..."
-msgstr "_Modifier les colonnes..."
-
-#: 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."
@@ -3332,159 +3263,136 @@ msgstr ""
"Affiche les erreurs qui se sont produites avec APT depuis le démarrage du "
"programme."
-#: src/gtk/aptitude.glade:311
-msgid "View Apt _Errors"
-msgstr "Afficher les _erreurs d'APT"
-
-#: src/gtk/aptitude.glade:325
+#: src/gtk/aptitude.glade:249
msgid "Find chains of dependencies linking one package to another."
msgstr "Trouve les chaînes de dépendances reliant un paquet à un autre."
-#: src/gtk/aptitude.glade:326
-msgid "Find _Dependency Chains"
-msgstr "_Trouver les chaînes de dépendances"
-
-#: src/gtk/aptitude.glade:345
-msgid "gtk-go-back"
-msgstr "gtk-go-back"
-
-#: src/gtk/aptitude.glade:355
-msgid "gtk-go-forward"
-msgstr "gtk-go-forward"
-
-#: src/gtk/aptitude.glade:365 src/gtk/aptitude.glade:765
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
msgid "_Help"
msgstr "_Aide"
-#: src/gtk/aptitude.glade:387
-msgid "gtk-about"
-msgstr "gtk-about"
-
-#: 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 "Tableau noir"
-#: src/gtk/aptitude.glade:422
+#: src/gtk/aptitude.glade:344
msgid "Update"
msgstr "_Mise à jour"
-#: 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 "Paquets"
-#: 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 "Aperçu"
-#: 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 "Solutions"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
msgid "Install/Remove"
msgstr "_Installer/Supprimer"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Supprimer"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-msgid "Purge"
-msgstr "_Purger"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Garder"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Geler"
-
-#: src/gtk/aptitude.glade:687
+#: src/gtk/aptitude.glade:590
msgid "Edit Columns..."
msgstr "Modifier les _colonnes..."
-#: src/gtk/aptitude.glade:700
+#: src/gtk/aptitude.glade:603
msgid "Dummy label (will be replaced at runtime)."
msgstr "Étiquette fictive (sera remplacée à l'exécution)."
-#: src/gtk/aptitude.glade:731
+#: src/gtk/aptitude.glade:631
msgid "Make this the default for new package lists."
msgstr "Établir comme défaut pour les nouvelles listes de paquets"
-#: src/gtk/aptitude.glade:747
+#: src/gtk/aptitude.glade:646
msgid "Apply these settings to all active package lists."
msgstr "Appliquer ces réglages à toutes les listes actives de paquets"
-#: 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
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: src/gtk/aptitude.glade:719 src/gtk/aptitude.glade:1425
+#: src/gtk/aptitude.glade:1754 src/gtk/aptitude.glade:1892
msgid "Search:"
msgstr "Rechercher :"
-#: 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 "gtk-find"
-#: src/gtk/aptitude.glade:845
+#: src/gtk/aptitude.glade:750
msgid "Incremental"
msgstr "Incrémental"
-#: 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
msgid "Errors"
msgstr "Erreurs"
-#: 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 "Montrer"
-#: src/gtk/aptitude.glade:986
+#: src/gtk/aptitude.glade:895
msgid "<span size=\"xx-large\">Versions:</span>"
msgstr "<span size=\"xx-large\">Versions :</span>"
-#: src/gtk/aptitude.glade:1046
+#: src/gtk/aptitude.glade:956
msgid "Dependencies"
msgstr "Dépendances"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
msgid "Changelog"
msgstr "Liste des modifications"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
msgid "Files"
msgstr "Fichiers"
-#: src/gtk/aptitude.glade:1115
+#: src/gtk/aptitude.glade:1025
msgid "popcon"
msgstr "score de popularité"
-#: src/gtk/aptitude.glade:1124
+#: src/gtk/aptitude.glade:1034
msgid "Popcon"
msgstr "Score de popularité"
-#: src/gtk/aptitude.glade:1135
+#: src/gtk/aptitude.glade:1045
msgid "tags"
msgstr "étiquettes"
-#: src/gtk/aptitude.glade:1192
+#: src/gtk/aptitude.glade:1106
msgid "Fixing upgrade manually:"
msgstr "Correction manuelle de la mise à jour :"
-#: src/gtk/aptitude.glade:1202 src/gtk/dashboardtab.cc:536
+#: src/gtk/aptitude.glade:1116 src/gtk/dashboardtab.cc:537
msgid "Calculating upgrade..."
msgstr "Calcul de la mise à jour..."
-#: src/gtk/aptitude.glade:1229
+#: src/gtk/aptitude.glade:1164
+msgid "<b>Solutions</b>"
+msgstr "<b>Solutions</b>"
+
+#: src/gtk/aptitude.glade:1182 src/gtk/download.cc:261
+#: src/gtk/entityview.cc:551
+msgid "Status"
+msgstr "État"
+
+#: src/gtk/aptitude.glade:1216
+msgid "Group by action type"
+msgstr "Grouper par type d'action"
+
+#: 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 "
@@ -3497,11 +3405,11 @@ msgstr ""
"\n"
"Ce mode est le mode d'affichage par défaut."
-#: src/gtk/aptitude.glade:1232
-msgid "Group by action type"
-msgstr "Grouper par type d'action"
+#: 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."
@@ -3509,67 +3417,54 @@ msgstr ""
"Affichage de l'ordre dans lequel les actions de la solution actuelle seront "
"exécutées et les dépendances qui motivent chacune de ces actions."
-#: src/gtk/aptitude.glade:1246
-msgid "Show an explanation of the solution"
-msgstr "Montrer une explication de la solution"
-
-#: src/gtk/aptitude.glade:1263
+#: src/gtk/aptitude.glade:1255
msgid "<b>View Mode</b>"
msgstr "<b>Mode d'affichage</b>"
-#: src/gtk/aptitude.glade:1307
+#: src/gtk/aptitude.glade:1297
msgid "Rejected"
msgstr "Rejetée"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
msgid "No preference"
msgstr "Pas de préférences"
-#: src/gtk/aptitude.glade:1331
+#: src/gtk/aptitude.glade:1328
msgid "Accepted"
msgstr "Acceptée"
-#: src/gtk/aptitude.glade:1347
+#: src/gtk/aptitude.glade:1348
msgid "<b>Status of selected action</b>"
msgstr "<b>État de l'action choisie</b>"
-#: src/gtk/aptitude.glade:1364 src/gtk/download.cc:261
-#: src/gtk/entityview.cc:551
-msgid "Status"
-msgstr "État"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr "<b>Solutions</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
+msgstr "Trouver une nouvelle solution"
-#: src/gtk/aptitude.glade:1442
+#: src/gtk/aptitude.glade:1373
msgid "Calculate the next solution that has not yet been generated."
msgstr "Calcul de la prochaine solution non encore créée"
-#: src/gtk/aptitude.glade:1443
-msgid "Find a new solution"
-msgstr "Trouver une nouvelle solution"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
+msgstr "gtk-apply"
-#: src/gtk/aptitude.glade:1457
+#: src/gtk/aptitude.glade:1388
msgid ""
"Perform the actions in the currently selected solution and close this tab."
msgstr ""
"Exécution des actions de la solution actuellement choisie et fermeture de "
"cet onglet."
-#: src/gtk/aptitude.glade:1458
-msgid "gtk-apply"
-msgstr "gtk-apply"
-
-#: src/gtk/aptitude.glade:1607
+#: src/gtk/aptitude.glade:1543
msgid "Upgrade Summary"
msgstr "Résumé de la mise à jour"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
msgid "Selected Package"
msgstr "Paquet choisi"
-#: 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."
@@ -3577,31 +3472,31 @@ msgstr ""
"Étiquette expliquant la mise à jour. Ce texte n'apparaîtra pas dans le "
"programme lors de son exécution."
-#: src/gtk/aptitude.glade:1682
+#: src/gtk/aptitude.glade:1619
msgid "Fix Manually"
msgstr "Corriger manuellement"
-#: 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 "Mettre à jour"
-#: src/gtk/aptitude.glade:1718
+#: src/gtk/aptitude.glade:1663
msgid "<b>Available Upgrades:</b>"
msgstr "<b>Mises à jour disponibles :</b>"
-#: src/gtk/aptitude.glade:1911
+#: src/gtk/aptitude.glade:1858
msgid "<b>Start at these packages:</b>"
msgstr "<b>Commencer avec ces paquets :</b>"
-#: src/gtk/aptitude.glade:2047
+#: src/gtk/aptitude.glade:1996
msgid "<b>End at these packages:</b>"
msgstr "<b>Terminer avec ces paquets :</b>"
-#: src/gtk/aptitude.glade:2115
+#: src/gtk/aptitude.glade:2064
msgid "A terminal running dpkg will appear here."
msgstr "Une fenêtre de terminal pour l'exécution de dpkg va apparaître ici."
-#: src/gtk/aptitude.glade:2127
+#: src/gtk/aptitude.glade:2076
msgid ""
"Placeholder label for the explanation that two conffiles are being "
"compared.\n"
@@ -3611,11 +3506,11 @@ msgstr ""
"fichiers de configuration.\n"
"Ce texte n'apparaître pas dans le programme."
-#: src/gtk/aptitude.glade:2153
+#: src/gtk/aptitude.glade:2105
msgid "View the differences\t"
msgstr "Voir les différences\t"
-#: 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\"."
@@ -3623,11 +3518,11 @@ msgstr ""
"Voulez-vous appliquer ces modifications ?\n"
"Si vous refusez, vous pouvez également modifier les fichiers vous-même."
-#: src/gtk/aptitude.glade:2191
+#: src/gtk/aptitude.glade:2143
msgid "gtk-yes"
msgstr "gtk-yes"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr "gtk-no"
@@ -3683,34 +3578,34 @@ msgstr ""
msgid "Downloading changelogs"
msgstr "Téléchargement du fichier de suivi des modifications"
-#: src/gtk/dashboardtab.cc:210
+#: src/gtk/dashboardtab.cc:211
msgid "Resolve Upgrade Manually"
msgstr "Résoudre la mise à jour manuellement"
-#: src/gtk/dashboardtab.cc:306
+#: src/gtk/dashboardtab.cc:307
msgid "Preparing to download changelogs"
msgstr "Préparation du téléchargement des fichiers de suivi des modifications"
-#: src/gtk/dashboardtab.cc:396
+#: src/gtk/dashboardtab.cc:397
msgid "Available upgrades:"
msgstr "Mise à jour disponibles :"
-#: src/gtk/dashboardtab.cc:413
+#: src/gtk/dashboardtab.cc:414
#, c-format
msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] " %d mise à jour disponible :"
msgstr[1] " %d mises à jour disponibles :"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
msgid "No upgrades are available."
msgstr "Pas de mise à jour disponible."
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
msgid "Unable to calculate an upgrade."
msgstr "Impossible de calculer la mise à jour."
-#: 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 "
@@ -3725,7 +3620,7 @@ msgstr[1] ""
"Tapez « %s » pour installer les <span size='large'>%d</span> mises à jour de "
"<span size='large'>%d</span>."
-#: 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'>"
@@ -3740,7 +3635,7 @@ msgstr[1] ""
"Tapez « %s » pour tenter d'installer <span size='large'>%d</span> mises à "
"jour restantes."
-#: 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 "
@@ -3749,12 +3644,12 @@ msgstr ""
"Impossible de calculer la mise à jour. Tapez « %s » pour rechercher vous-même "
"une solution."
-#: src/gtk/dashboardtab.cc:704
+#: src/gtk/dashboardtab.cc:705
#, c-format
msgid "Internal error encountered while calculating an upgrade: %s"
msgstr "Erreur interne lors de calcul de la mise à jour  : %s"
-#: 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 "
@@ -3763,25 +3658,25 @@ msgstr ""
"Le paquet %s n'a pas de version candidate et ne sera pas mis à jour : il est "
"impossible d'afficher son journal de suivi des modifications."
-#: src/gtk/dependency_chains_tab.cc:77
+#: src/gtk/dependency_chains_tab.cc:78
msgid "Find dependency chains: start"
msgstr "Recherche des chaînes de dépendances : début"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
msgid "Find dependency chains: end"
msgstr "Recherche des chaînes de dépendances : fin"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
msgid "Find dependency chains: results"
msgstr "Recherche des chaînes de dépendances : résultats"
-#: 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 ""
"Veuillez choisir un ou plusieurs paquets de démarrage et un paquet de fin "
"pour la recherche."
-#: src/gtk/dependency_chains_tab.cc:276
+#: src/gtk/dependency_chains_tab.cc:281
msgid "No dependency chain found."
msgstr "Pas de chaîne de dépendance trouvée."
@@ -4001,6 +3896,10 @@ msgstr "Réinstaller"
msgid "Downgrade"
msgstr "Réinstaller vers une version antérieure"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Supprimer"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr "Supprimer et purger la configuration et les données"
@@ -4175,6 +4074,18 @@ msgstr "Non installé"
msgid "Install/Upgrade"
msgstr "Installer/Mettre à jour"
+#: src/gtk/gui.cc:1377
+msgid "Purge"
+msgstr "_Purger"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Garder"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Geler"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr "Définir comme automatique"
@@ -4230,116 +4141,116 @@ msgstr "Info"
msgid "Unknown"
msgstr "Inconnu"
-#: src/gtk/packagestab.cc:60
+#: src/gtk/packagestab.cc:61
msgid "Parse error"
msgstr "Erreur d'analyse"
-#: src/gtk/packagestab.cc:203
+#: src/gtk/packagestab.cc:204
#, c-format
msgid "No packages matched \"%s\"."
msgstr "Aucun paquet ne correspond à « %s »."
-#: src/gtk/packagestab.cc:313
+#: src/gtk/packagestab.cc:314
msgid "Enter a search and click \"Find\" to display packages."
msgstr ""
"Veuillez indiquer une recherche et cliquer « Rechercher » pour afficher les "
"paquets correspondants."
-#: src/gtk/packagestab.cc:413
+#: src/gtk/packagestab.cc:416
msgid "Packages: "
msgstr "Paquets : "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, c-format
msgid "Upgrade to %s version %s"
msgstr "Mettre à jour vers %s version %s"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, c-format
msgid "Install %s version %s"
msgstr "Installer %s version %s"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, c-format
msgid "Downgrade to %s version %s"
msgstr "Revenir à %s version %s "
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, c-format
msgid "Don't hold %s at its current version."
msgstr "Ne pas conserver %s à sa version actuelle."
-#: 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
#, c-format
msgid "Cancel any actions on %s."
msgstr "Annuler toutes actions sur %s."
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, c-format
msgid "Cancel the purge of %s."
msgstr "Abandonner la purge de %s."
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, c-format
msgid "Cancel the removal of %s."
msgstr "Abandonner la suppression de %s."
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, c-format
msgid "Cancel the upgrade of %s."
msgstr "Abandonner la mise à jour de %s."
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, c-format
msgid "Cancel the installation of %s."
msgstr "Abandonner l'installation de %s."
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, c-format
msgid "Cancel the downgrade of %s."
msgstr "Abandonner le retour à une version antérieure de %s."
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, c-format
msgid "Cancel the reinstallation of %s."
msgstr "Abandonner la réinstallation de %s."
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, c-format
msgid "Remove %s"
msgstr "Supprimer %s"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, c-format
msgid "Purge %s"
msgstr "Purger %s"
-#: src/gtk/packagestab.cc:591
+#: src/gtk/packagestab.cc:594
#, c-format
msgid "Hold %s at its current version."
msgstr "Garder %s à sa version actuelle."
-#: src/gtk/packagestab.cc:596
+#: src/gtk/packagestab.cc:599
#, c-format
msgid "Mark %s as automatically installed."
msgstr "Marquer %s comme ayant été installé automatiquement"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, c-format
msgid "Mark %s as manually installed."
msgstr "Marquer %s comme installé manuellement."
-#: src/gtk/packagestab.cc:643
+#: src/gtk/packagestab.cc:646
#, c-format
msgid "%s is a virtual package provided by:\n"
msgstr "%s est un paquet virtuel fourni par :\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 "(plus d'informations...)"
-#: src/gtk/packagestab.cc:736
+#: src/gtk/packagestab.cc:739
msgid "Source: "
msgstr "Source : "
@@ -4363,24 +4274,24 @@ msgstr "%s a été installé manuellement."
msgid "%s is being installed manually."
msgstr "%s va être installé manuellement."
-#: src/gtk/pkgview.cc:399
+#: src/gtk/pkgview.cc:401
msgid "Cache reloading, please wait..."
msgstr "Rechargement du cache, veuillez patienter..."
-#: src/gtk/pkgview.cc:604
+#: src/gtk/pkgview.cc:607
msgid "Searching..."
msgstr "Recherche..."
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
msgid "Finalizing view"
msgstr "Finalisation de la vue"
-#: 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 "Construction de la vue"
-#: 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 "
@@ -4396,7 +4307,7 @@ msgstr ""
" La présence de cet arbre indique que quelque chose est certainement cassé "
"soit sur votre système soit dans l'archive 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 "
@@ -4409,7 +4320,7 @@ msgstr ""
"conduira à ce que plus aucun des paquets ne les déclarera comme une "
"dépendance « importante ».\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 "
@@ -4419,7 +4330,7 @@ msgstr ""
" Ces paquets pourraient être mis à jour mais ont été maintenus dans leur "
"état actuel afin d'éviter de casser des dépendances."
-#: 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 "
@@ -4429,7 +4340,7 @@ msgstr ""
" Ces paquets ont été installés parce qu'ils sont nécessaires à un nouveau "
"paquet dont vous avez demandé l'installation."
-#: 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 "
@@ -4441,7 +4352,7 @@ msgstr ""
"dépendances ne sont plus disponible ou parce qu'ils sont en conflit avec un "
"autre paquet."
-#: 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 "
@@ -4451,7 +4362,7 @@ msgstr ""
" Une version plus ancienne que la version actuellement installée de ces "
"paquets va être installée."
-#: 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 "
@@ -4461,7 +4372,7 @@ msgstr ""
" Ces paquets pourraient être mis à jour mais vous avez demandé à ce qu'ils "
"soient maintenus dans leur version actuelle."
-#: 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."
@@ -4469,7 +4380,7 @@ msgstr ""
"Paquets qui vont être réinstallés\n"
" Ces paquets vont être réinstallés."
-#: 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 "
@@ -4479,7 +4390,7 @@ msgstr ""
" Ces paquets ont été marqués manuellement comme devant être installés sur "
"votre ordinateur."
-#: 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."
@@ -4487,7 +4398,7 @@ msgstr ""
"Paquets à enlever\n"
" Ces paquets ont été sélectionnés manuellement afin d'être enlevés"
-#: 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."
@@ -4495,7 +4406,7 @@ msgstr ""
"Paquets à mettre à jour\n"
" Ces paquets vont être mis à jour vers une nouvelle version"
-#: 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 "
@@ -4505,7 +4416,7 @@ msgstr ""
" Ces paquets ne sont pas complètement installés et configurés ; une "
"tentative pour terminer leur installation sera faite."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
msgid "Preview: "
msgstr "Aperçu :"
@@ -4527,51 +4438,57 @@ msgstr ""
"\n"
"%s"
-#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275
+#: src/gtk/resolver.cc:207
+#, fuzzy
+#| msgid "first-package"
+msgid "Virtual package"
+msgstr "first-package"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Non installé"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, c-format
msgid "Removing %s is rejected."
msgstr "La suppression de %s est rejetée."
-#: src/gtk/resolver.cc:337
+#: src/gtk/resolver.cc:377
#, c-format
msgid "Canceling the installation of %s is rejected."
msgstr "L'abandon de l'installation de %s est rejeté."
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, c-format
msgid "Canceling the removal of %s is rejected."
msgstr "L'abandon de la suppression de %s est rejeté."
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, c-format
msgid "Keeping %s at version %s is rejected."
msgstr "La conservation de %s à la version %s est rejetée."
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, c-format
msgid "Installing %s version %s is rejected."
msgstr "L'installation de %s version %s est rejetée."
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "Le retour de %s à la version %s est rejeté."
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, c-format
msgid "Upgrading %s to version %s is rejected."
msgstr "La mise à jour de %s vers la version %s est rejetée."
-#: src/gtk/resolver.cc:386
+#: src/gtk/resolver.cc:426
#, c-format
msgid "Removing %s is preferred over all un-accepted alternatives."
msgstr "La suppression de %s est préférée aux alternatives non acceptées."
-#: src/gtk/resolver.cc:391
+#: src/gtk/resolver.cc:431
#, c-format
msgid ""
"Canceling the installation of %s is preferred over all un-accepted "
@@ -4579,14 +4496,14 @@ msgid ""
msgstr ""
"L'abandon de l'installation de %s est préféré aux alternatives non acceptées."
-#: 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 ""
"L'abandon de la suppression de %s est préféré aux alternatives non acceptées."
-#: 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."
@@ -4594,21 +4511,21 @@ msgstr ""
"La conservation de %s à la version %s est préférée aux alternatives non "
"acceptées."
-#: 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 ""
"L'installation de %s version %s est préférée aux alternatives non acceptées."
-#: 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 ""
"Le retour de %s à la version %s est préféré aux alternatives non acceptées."
-#: 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."
@@ -4616,29 +4533,29 @@ msgstr ""
"La mise à jour de %s vers la version %s est préférée aux alternatives non "
"acceptées."
-#: src/gtk/resolver.cc:441
+#: src/gtk/resolver.cc:481
#, c-format
msgid "Leaving %ls unresolved is rejected."
msgstr "Laisser %ls non résolu est rejeté."
-#: src/gtk/resolver.cc:447
+#: src/gtk/resolver.cc:487
#, c-format
msgid "Leaving %ls unresolved is preferred over all un-accepted alternatives."
msgstr "Laisser %ls non résolu est préféré aux alternatives non acceptées."
-#: 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] "Méthode de traitement de l'action choisie"
msgstr[1] "Méthode de traitement des actions choisies"
-#: 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] "Ignorer les solutions contenant cette action."
msgstr[1] "Ignorer les solutions contenant ces actions."
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4652,7 +4569,7 @@ msgstr[1] ""
"Autoriser les solutions contenant ces actions, sans les préférer à d'autres "
"solutions."
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4660,236 +4577,248 @@ msgid_plural ""
msgstr[0] "Toujours préférer cette action aux alternatives non acceptées."
msgstr[1] "Toujours préférer ces actions aux alternatives non acceptées."
-#: 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 dépend de %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 pré-dépend de %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 suggère %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 recommande %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 est en conflit avec %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 casse %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 remplace %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 rend obsolète %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 "Supprimer les paquets suivants :"
-#: 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 "Installer les paquets suivants :"
-#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781
+#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848
msgid "Keep the following packages:"
msgstr "Conserver les paquets suivants :"
-#: 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 "Mettre à jour les paquets suivants :"
-#: 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 "Réinstaller à une version antérieure les paquets suivants :"
-#: src/gtk/resolver.cc:1369 src/gtk/resolver.cc:1819
+#: src/gtk/resolver.cc:1425 src/gtk/resolver.cc:1886
msgid "Leave the following dependencies unresolved:"
msgstr "Laisser les dépendances suivantes non satisfaites :"
-#: src/gtk/resolver.cc:1444
+#: src/gtk/resolver.cc:1502
#, c-format
msgid "Remove %s [<big>%s</big> (%s)]"
msgstr "Supprimer %s [<big>%s</big> (%s)]"
-#: src/gtk/resolver.cc:1451
+#: src/gtk/resolver.cc:1509
#, c-format
msgid "Install %s [<big>%s</big> (%s)]"
msgstr "Installer %s [<big>%s</big> (%s)]"
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, c-format
msgid "Cancel the installation of %s"
msgstr "Abandonner l'installation de %s"
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, c-format
msgid "Cancel the removal of %s"
msgstr "Abandonner la suppression de %s"
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, c-format
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr "Conserver %s à la version <big>%s</big> (%s)"
-#: src/gtk/resolver.cc:1472
+#: src/gtk/resolver.cc:1530
#, c-format
msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr "Mettre à jour %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
-#: src/gtk/resolver.cc:1481
+#: src/gtk/resolver.cc:1539
#, c-format
msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr ""
"Réinstaller %s à une version antérieure [<big>%s</big> (%s) -> <big>%s</big> "
"(%s)]"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>Remove</b> %s"
msgstr "<b>Supprimer</b> %s"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>remove</b> %s"
msgstr "<b>supprimer</b> %s"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, c-format
msgid "<b>Keep</b> %s at version %s"
msgstr "<b>Conserver</b> %s à la version %s"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, c-format
msgid "<b>keep</b> %s at version %s"
msgstr "<b>conserver</b> %s à la version %s"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %s"
+msgid "<b>Cancel</b> the installation of %s"
+msgstr "Abandonner l'installation de %s"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %s"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Abandonner l'installation de %s"
+
+#: src/gtk/resolver.cc:1622
#, c-format
msgid "<b>Install</b> %s %s"
msgstr "<b>Installer</b> %s %s"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1622
#, c-format
msgid "<b>install</b> %s %s"
msgstr "<b>installer</b> %s %s"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "<b>Revenir</b> à %s version %s"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "<b>revenir</b> à %s version %s"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>Upgrade</b> %s to version %s"
msgstr "<b>Mettre à jour</b> %s vers la version %s"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>upgrade</b> %s to version %s"
msgstr "<b>mettre à jour</b> %s vers la version %s"
-#: src/gtk/resolver.cc:1586
+#: src/gtk/resolver.cc:1653
#, c-format
msgid "Leave %s unresolved"
msgstr "Laisser %s non résolu"
-#: src/gtk/resolver.cc:1586
+#: src/gtk/resolver.cc:1653
#, c-format
msgid "leave %s unresolved"
msgstr "laisser %s non résolu"
-#: src/gtk/resolver.cc:1654
+#: src/gtk/resolver.cc:1721
#, c-format
msgid "%s install"
msgid_plural "%s installs"
msgstr[0] "%s installation"
msgstr[1] "%s installations"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, c-format
msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "%s suppression"
msgstr[1] "%s suppressions"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, c-format
msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "%s à conserver"
msgstr[1] "%s à conserver"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, c-format
msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "%s à mettre à jour"
msgstr[1] "%s à mettre à jour"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, c-format
msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "%s vers version antérieure"
msgstr[1] "%s vers version antérieure"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, c-format
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "%s recommandation non résolue"
msgstr[1] "%s recommandations non résolues"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
msgid "No solutions yet."
msgstr "Pas de solution actuellement."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
msgid "No dependency solution was found."
msgstr "Aucune solution n'a été trouvée pour les dépendances"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
msgid "No solutions."
msgstr "Pas de solution."
-#: src/gtk/resolver.cc:1994
+#: src/gtk/resolver.cc:2061
msgid "To view a solution, select it from the list to the right."
msgstr "Pour afficher une solution, choisissez la dans la liste de droite."
-#: src/gtk/resolver.cc:1995
+#: src/gtk/resolver.cc:2062
#, c-format
msgid "%u solutions."
msgstr "%u solutions."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr "Solution %s de %s (tier %s)."
@@ -7762,6 +7691,75 @@ msgstr "Téléchargement du fichier « Changelog »"
msgid "Download Changelog"
msgstr "Téléchargement du fichier « Changelog »"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "_Installer/enlever des paquets"
+
+#~ msgid "_Update Package List"
+#~ msgstr "_Mettre à jour les listes de paquets"
+
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Marquer comme étant susceptible de mise à _jour"
+
+#~ msgid "_Forget New Packages"
+#~ msgstr "_Oublier quels paquets sont nouveaux"
+
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Annu_ler les actions en attente"
+
+#~ msgid "C_lean Package Cache"
+#~ msgstr "_Nettoyer le cache des paquets"
+
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Enlever les fichiers _périmés"
+
+#~ msgid "_Reload Package Cache"
+#~ msgstr "_Recharger le cache des paquets"
+
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Jouer au _démineur"
+
+#~ msgid "_Become Root"
+#~ msgstr "Devenir _superutilisateur"
+
+#~ msgid "_Quit"
+#~ msgstr "_Quitter"
+
+#~ msgid "gtk-undo"
+#~ msgstr "gtk-undo"
+
+#~ msgid "gtk-cut"
+#~ msgstr "gtk-cut"
+
+#~ msgid "gtk-copy"
+#~ msgstr "gtk-copy"
+
+#~ msgid "gtk-paste"
+#~ msgstr "gtk-paste"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "_Edit Columns..."
+#~ msgstr "_Modifier les colonnes..."
+
+#~ msgid "View Apt _Errors"
+#~ msgstr "Afficher les _erreurs d'APT"
+
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "_Trouver les chaînes de dépendances"
+
+#~ msgid "gtk-go-back"
+#~ msgstr "gtk-go-back"
+
+#~ msgid "gtk-go-forward"
+#~ msgstr "gtk-go-forward"
+
+#~ msgid "gtk-about"
+#~ msgstr "gtk-about"
+
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "Montrer une explication de la solution"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(pour %s)"
diff --git a/po/gl.po b/po/gl.po
index 0ede2f29..1d99bf07 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-04-19 14:12+0100\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -645,8 +645,8 @@ msgstr "Erro grave no resolvedor"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] A resolver as dependencias"
-#: 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 "Erro interno: non se esperaba unha solución nula."
@@ -1721,7 +1721,7 @@ msgstr ""
"dependencias."
#: 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 "A resolver as dependencias..."
@@ -1828,7 +1828,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Os seguintes paquetes teñen dependencias sen cumprir:\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 "<NULO>"
@@ -1964,8 +1964,8 @@ msgstr "Instalado automaticamente"
msgid "no"
msgstr "non"
-#: 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 "Versión: "
@@ -2044,12 +2044,12 @@ msgid "Obsoletes"
msgstr "Fai obsoleto"
#: 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 "Fornece"
#: 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 "Descrición: "
@@ -2204,8 +2204,7 @@ msgstr "Actual"
msgid "Candidate"
msgstr "Candidato"
-#: 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 "Instalar"
@@ -2346,7 +2345,7 @@ msgstr "SEN SATISFACER"
msgid "UNAVAILABLE"
msgstr "NON DISPOÑIBLES"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Etiquetas"
@@ -2624,54 +2623,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 "Sección"
-#: 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 "^Cancelar as accións pendentes"
-#: 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 "\"-\" para eliminar paquetes"
-#: 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 "non é un paquete de verdade"
-#: 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 "Eliminar os seguintes paquetes:"
-#: 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 "
@@ -3136,101 +3135,47 @@ msgstr ""
msgid "_File"
msgstr "Falso"
-#: 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 "Realizar tódalas instalacións e eliminacións pendentes"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Instalar/eliminar paquetes"
-
-#: 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 "Buscar novas versións dos paquetes"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Actualizar a lista de paquetes"
-
-#: 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 ""
"Marcar tódolos paquetes actualizables que non están retidos para os "
"actualizar"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "^Marcar os actualizables"
-
-#: 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 "Esquecer que paquetes son \"novos\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Esquecer os paquetes novos"
-
-#: 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 ""
"Cancelar tódalas instalacións, eliminacións, retencións e actualizacións "
"pendentes"
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "^Cancelar as accións pendentes"
-
-#: 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 "Borrar os ficheiros con paquetes que se descargaron anteriormente"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Limpar a caché de paquetes"
-
-#: 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 "Borrar os ficheiros de paquetes que xa non se poden descargar"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "^Borrar os ficheiros obsoletos"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Recargar a caché de paquetes"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Recargar a caché de paquetes"
-
-#: 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 "Perder o tempo buscando minas"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Xogar ao Buscaminas"
-
-#: 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"
@@ -3238,261 +3183,200 @@ msgstr ""
"Execute \"su\" para se facer administrador; isto ha reiniciar o programa, "
"pero hase conservar a súa configuración"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Facerse administrador"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Saír do programa"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Saír"
-
-#: 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 "Desfacer a última operación ou grupo de operacións sobre os paquetes"
-#: 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 "borrar"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paquete"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Vistas"
-#: 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 "Xestión de dependencias"
-
-#: 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 "borrar"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Axuda"
-#: 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 "Actualización das listas"
-#: 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 "Paquetes"
-#: 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 "Previsualización"
-#: 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 "Resolvedor"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Instalado"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Eliminar"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Purgar"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Conservar"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Reter"
-
-#: 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 "Quitar o filtro da lista de paquetes"
-#: 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 "Aplicar un filtro á lista de paquetes"
-#: 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 "borrar"
+
+#: 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 "Busca"
-#: 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 "reinstalar"
-#: 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 "Err "
-#: 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 "Dependencias de %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Rexistro de cambios"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Falso"
-#: 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 "Etiquetas"
-#: 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 "Estado"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Tipo de acción descoñecido: %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 "
@@ -3501,150 +3385,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 "Tipo de acción descoñecido: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "ver unha explicación dos cambios na solución"
-
-#: 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 "Cambiar ^rexeitada"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Preferencias"
-#: 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 "Estado"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Examinar solución"
-#: 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 "Escoller a seguinte solución aos problemas de dependencias."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Examinar solución"
+#: 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 "Realizar as accións contidas na solución seleccionada actualmente."
-#: 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 "Actualizar"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Paquete fonte: "
-#: 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 "Manual"
-#: 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 "Actualizar"
-#: 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 "si"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3697,21 +3562,21 @@ msgstr "A descargar o rexistro de cambios"
msgid "Downloading changelogs"
msgstr "A descargar o rexistro de cambios"
-#: 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 a empregar para descargar os rexistros de cambios"
-#: 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"
@@ -3720,19 +3585,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d actualización"
msgstr[1] "%d actualizacións"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Sen instalar"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Non se puido atopar o paquete %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 "
@@ -3743,7 +3608,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3754,49 +3619,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Erro interno: A cadea de columnas por defecto non é analizable"
-#: 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 "Xestión de dependencias"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Xestión de dependencias"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Xestión de dependencias"
-#: 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."
@@ -4061,6 +3926,10 @@ msgstr "Reinstalar"
msgid "Downgrade"
msgstr "Desactualizar"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Eliminar"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4258,6 +4127,20 @@ msgstr "sen instalar"
msgid "Install/Upgrade"
msgstr "Instalado"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Purgar"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Conservar"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Reter"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4323,133 +4206,133 @@ msgstr "non"
msgid "Unknown"
msgstr "Descoñecido"
-#: 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 "Non hai paquetes que encaixen no patrón \"%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 "Paquete: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "Versións de %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 "Instalar(%s fornece %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 " Versión de 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 "Conservar os seguintes paquetes na súa versión actual:"
-#: 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 "^Cancelar as accións pendentes"
-#: 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 "Cancelar a eliminación de %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 "Cancelar a eliminación de %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 "Cancelar a eliminación de %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 "Cancelar a instalación de %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 "Cancelar a eliminación de %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 "Cancelar a instalación de %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Eliminar(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Purgar"
-#: 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\" para marcar paquetes coma instalados automaticamente"
-#: 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 "O paquete \"%s\" está instalado manualmente.\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\" é un paquete virtual fornecido por:\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: "
@@ -4479,28 +4362,28 @@ msgstr "%s; hase instalar automaticamente"
msgid "%s is being installed manually."
msgstr "%s; hase instalar automaticamente"
-#: 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 "Busca"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "A construir a vista"
-#: 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 "A construir a vista"
-#: 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 "
@@ -4516,7 +4399,7 @@ msgstr ""
" A presencia desta árbore seguramente indique que algo está roto, xa sexa no "
"seu sistema ou no arquivo de 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 "
@@ -4528,7 +4411,7 @@ msgstr ""
"dependencias, e a acción planeada ha facer que non haxa instalado ningún "
"paquete cunha dependencia \"importante\" neles.\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 "
@@ -4538,7 +4421,7 @@ msgstr ""
" Estes paquetes poderíanse actualizar, pero consérvanse no seu estado actual "
"para evitar romper dependencias."
-#: 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 "
@@ -4548,7 +4431,7 @@ msgstr ""
" Estes paquetes instálanse porque son necesarios para outro paquete que "
"escolleu instalar."
-#: 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 "
@@ -4558,7 +4441,7 @@ msgstr ""
" Estes paquetes elimínanse porque algunha das súas dependencias xa non está "
"dispoñible ou porque outro paquete ten un conflicto con eles."
-#: 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 "
@@ -4568,7 +4451,7 @@ msgstr ""
" Hase instalar unha versión máis antiga destes paquetes cá que está "
"instalada actualmente."
-#: 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 "
@@ -4578,7 +4461,7 @@ msgstr ""
" Estes paquetes poderian se actualizar, pero pediu que se retiveran na súa "
"versión actual."
-#: 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."
@@ -4586,7 +4469,7 @@ msgstr ""
"Paquetes para reinstalar\n"
" Hanse reinstalar estes paquetes."
-#: 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 "
@@ -4596,7 +4479,7 @@ msgstr ""
" Estes paquetes seleccionáronse manualmente para os instalar no seu "
"ordenador."
-#: 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."
@@ -4604,7 +4487,7 @@ msgstr ""
"Paquetes para eliminar\n"
" Estes paquetes seleccionáronse manualmente para os eliminar."
-#: 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."
@@ -4612,7 +4495,7 @@ msgstr ""
"Paquetes para actualizar\n"
" Estes paquetes hanse actualizar a unha versión máis recente."
-#: 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 "
@@ -4622,7 +4505,7 @@ msgstr ""
" Estes paquetes non están completamente instalados e configurados; hase "
"tentar completar a súa instalación."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4643,117 +4526,123 @@ 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 "Paquete"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Sen instalar"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "A eliminar %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 "Cancelar a instalación de %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 "Cancelar a eliminación de %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 "Conservar %F na versión %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 "Instalar(%s fornece %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 " Versión de 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 "Versións de %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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4763,7 +4652,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4771,192 +4660,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 depende de %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 pre-depende de %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 suxire %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 recomenda %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 ten conflictos con %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 rompe %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 substitúe a %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 fai obsoleto a %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 "Eliminar os seguintes paquetes:"
-#: 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 "Instalar os seguintes paquetes:"
-#: 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 "Eliminar os seguintes paquetes:"
-#: 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 "Actualizar os seguintes paquetes:"
-#: 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 "Desactualizar os seguintes paquetes:"
-#: 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 "Déixanse sen resolver as seguintes dependencias:%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 "Eliminar %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 "Instalar %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 "Cancelar a instalación de %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 "Cancelar a eliminación de %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 "Conservar %F na versión %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 "Actualizar %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 "Desactualizar %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 "Eliminar(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Eliminar(%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 "Conservar %F na versión %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 "Conservar %F na versión %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 "Cancelar a instalación de %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Cancelar a instalación de %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Instalar %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 "Instalar %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 " Versión de 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 " Versión de 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 "Versións de %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 "Versións de %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"
@@ -4965,7 +4866,7 @@ msgid_plural "%s installs"
msgstr[0] "%d instalación"
msgstr[1] "%d instalacións"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4974,7 +4875,7 @@ msgid_plural "%s removes"
msgstr[0] "%d eliminación"
msgstr[1] "%d eliminacións"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4983,7 +4884,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d conservado"
msgstr[1] "%d conservados"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4992,7 +4893,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d actualización"
msgstr[1] "%d actualizacións"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5001,7 +4902,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d desactualización"
msgstr[1] "%d desactualizacións"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5009,35 +4910,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Auditar as ^recomendacións"
msgstr[1] "Auditar as ^recomendacións"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Non hai máis solucións."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Xestión de dependencias"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Non hai máis solucións."
-#: 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 "Non hai máis solucións."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7877,6 +7778,76 @@ msgstr "A descargar o rexistro de cambios"
msgid "Download Changelog"
msgstr "Descargar rexistro de cambios"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Instalar/eliminar paquetes"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Actualizar a lista de paquetes"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "^Marcar os actualizables"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Esquecer os paquetes novos"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "^Cancelar as accións pendentes"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Limpar a caché de paquetes"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "^Borrar os ficheiros obsoletos"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Recargar a caché de paquetes"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Xogar ao Buscaminas"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Facerse administrador"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Saír"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "borrar"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Xestión de dependencias"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "ver unha explicación dos cambios na solución"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(para %s)"
diff --git a/po/hu.po b/po/hu.po
index 3be8fbaf..b3bb8192 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_po_hu\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: 2006-10-12 20:44+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -529,8 +529,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Függőségek feloldása"
-#: 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 "Belső hiba: váratlan üres megoldás."
@@ -1592,7 +1592,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "Függőségek feloldása..."
@@ -1693,7 +1693,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "A következő csomagoknak vannak nem teljesített függőségeik:\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>"
@@ -1829,8 +1829,8 @@ msgstr "Automatikusan telepített"
msgid "no"
msgstr "nem"
-#: 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 "Verzió: "
@@ -1909,12 +1909,12 @@ msgid "Obsoletes"
msgstr "Elavulttá teszi"
#: 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 "Biztosítja"
#: 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 "Leírás:"
@@ -2071,8 +2071,7 @@ msgstr ""
msgid "Candidate"
msgstr "JelV"
-#: 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 "Telepít"
@@ -2212,7 +2211,7 @@ msgstr "TELJESÍTETLEN"
msgid "UNAVAILABLE"
msgstr "NEM ELÉRHETŐ"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Tag-ek"
@@ -2485,54 +2484,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 "Szakasz"
-#: 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 "Függő műveletek törlés^e"
-#: 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 "'-' csomag eltávolítása"
-#: 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 "nem valódi csomag"
-#: 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 "Az alábbi csomagok eltávolítása:"
-#: 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 "
@@ -2982,97 +2981,43 @@ msgstr ""
msgid "_File"
msgstr "Bezár"
-#: 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 "Minden függőben lévő telepítés és eltávolítás végrehajtása"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "Csomagok ^telepítése/eltávolítása"
-
-#: 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 "Csomagok új verzióinak keresése"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "Csomaglista f^rissítése"
-
-#: 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 "Azon frissíthető csomagok megjelölése, amik nincsenek visszatartva"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Fri^ssíthetőnek jelöl"
-
-#: 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 "Az \"új csomagok\" lista törlése"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "Új csomagok el^felejtése"
-
-#: 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 "Minden függő telepítés, eltávolítás, fogás és frissítés törlése"
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Függő műveletek törlés^e"
-
-#: 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 "A korábban letöltött csomagfájlok törlése"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Csomaggyorstár tisztítása"
-
-#: 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 "A már nem letölthető csomagfájlok törlése"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Elav^ult fájlok tisztítása"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "A csomaggyorstár újbóli beolvasása"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "Csomaggyorstár új^ratöltése"
-
-#: 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 "Időpocsékolás aknakeresésre"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Aknakereső ^játék"
-
-#: 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"
@@ -3080,259 +3025,199 @@ msgstr ""
"Ha rendszergazdaként akarsz belépni, futtasd a 'su'-t; ez újraindítja a "
"programot, de megőrződnek a beállításaid"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Bejelentkezek rendszergazdaként"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Kilépés a programból"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Kilépés"
-
-#: 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 "Az utolsó csomagművelet vagy műveletcsoport visszavonása"
-#: 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 "eltávolítás"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Csomag"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Nézetek"
-#: 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 "Find _Dependency Chains"
-msgstr "^Függőség kezelés"
-
-#: 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 "eltávolítás"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Súgó"
-#: 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 "Lista frissítés"
-#: 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 "Csomagok"
-#: 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 "Előnézet"
-#: 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 "Ütközésfeloldó"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Telepített"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Eltávolít"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "Tör^lés"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Tart"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Visszafog"
-
-#: 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 "Leszedi a csomaglista szűrőjét"
-#: 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 "Szűrőt alkalmaz a csomaglistára"
-#: 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 "eltávolítás"
+
+#: 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 "Keresés"
-#: 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 "újratelepítés"
-#: 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 "Hib "
-#: 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 függőségei"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Munkanapló"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
msgid "Files"
msgstr "Bezár"
-#: 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 "Tag-ek"
-#: 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 "Állapot"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Ismeretlen művelettípus: %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 "
@@ -3341,149 +3226,130 @@ 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 "Ismeretlen művelettípus: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "a javasolt változtatások magyarázatának megtekintése"
-
-#: 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 "El^dobás"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
msgid "No preference"
msgstr "ElőFüggőségek"
-#: 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 "Állapot"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "Megoldás vizs^gálata"
-#: 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 "Következő megoldás kijelölése a függőségi problémához"
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "Megoldás vizs^gálata"
+#: 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 "A jelen megoldás műveleteinek végrehajtása"
-#: 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 "Frissít"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Forráscsomag: "
-#: 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 "Kézikönyv"
-#: 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 "Frissít"
-#: 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 "igen"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3536,21 +3402,21 @@ msgstr "Munkanapló letöltése"
msgid "Downloading changelogs"
msgstr "Munkanapló letöltése"
-#: 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 a módosításnaplók letöltéséhez"
-#: 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"
@@ -3559,19 +3425,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d frissítés"
msgstr[1] "%d frissítés"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Nincs telepítve"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Nem találom a(z) %s csomagot"
-#: 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 "
@@ -3582,7 +3448,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3593,46 +3459,46 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Belső hiba: az alap oszlopszöveg nem elemezhető"
-#: 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 "Find dependency chains: start"
msgstr "^Függőség kezelés"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
msgid "Find dependency chains: end"
msgstr "^Függőség kezelés"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
msgid "Find dependency chains: results"
msgstr "^Függőség kezelés"
-#: 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 "No dependency chain found."
msgstr "^Függőség kezelés"
@@ -3891,6 +3757,10 @@ msgstr "Újratelepít"
msgid "Downgrade"
msgstr "Visszafejleszt"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Eltávolít"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4085,6 +3955,20 @@ msgstr "nincs telepítve"
msgid "Install/Upgrade"
msgstr "Telepített"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "Tör^lés"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Tart"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Visszafog"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4146,129 +4030,129 @@ msgstr "nem"
msgid "Unknown"
msgstr "Ismeretlen"
-#: 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 "Nincs \"%ls\" mintára illeszkedő csomag."
-#: 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 "Csomag: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s verziói"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
msgid "Install %s version %s"
msgstr "%s %s (%s) telepítése"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "libsigc++ verzió: %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 "Az alábbi csomagok jelenlegi verzión tartása:"
-#: 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 "Függő műveletek törlés^e"
-#: 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 "A(z) %F törlésének lemondása"
-#: 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 "A(z) %F törlésének lemondása"
-#: 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 "A(z) %F törlésének lemondása"
-#: 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 "A(z) %F telepítésének lemondása"
-#: 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 "A(z) %F törlésének lemondása"
-#: 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 "A(z) %F telepítésének lemondása"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
msgid "Remove %s"
msgstr "Eltávolít"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "Tör^lés"
-#: 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' csomag megjelölése automatikusan telepítettként"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr "'&m' csomag megjelölése manuálisan telepítettként"
-#: 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 "A(z) \"%s\" virtuális csomag, amit biztosít:\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: "
@@ -4298,28 +4182,28 @@ msgstr "%s; automatikusan telepítve lesz"
msgid "%s is being installed manually."
msgstr "%s; automatikusan telepítve lesz"
-#: 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 "Keresés"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Nézet készítése"
-#: 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 "Nézet készítése"
-#: 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 "
@@ -4335,7 +4219,7 @@ msgstr ""
" Ennek a listának a jelenléte arra utal, hogy valami sérült vagy a helyi "
"rendszeren vagy a Debian archívumban."
-#: 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 "
@@ -4347,7 +4231,7 @@ msgstr ""
"automatikusan lettek telepítve, és a tervezett műveletek után nem marad "
"olyan csomag, ami 'erősen' függ tőle.\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 "
@@ -4357,7 +4241,7 @@ msgstr ""
" Ezeket a csomagokat lehetne frissíteni, de meg kell őrizni a jelenlegi "
"állapotukat a függőségek teljesítése miatt."
-#: 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 "
@@ -4367,7 +4251,7 @@ msgstr ""
" Ezek a csomagok más telepítésre választott csomagok igényei miatt lesznek "
"telepítve."
-#: 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 "
@@ -4377,7 +4261,7 @@ msgstr ""
" Ezek a csomagok immár elérhetetlen függőségeik vagy egy más csomaggal való "
"ütközésük miatt lesznek törölve."
-#: 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 "
@@ -4387,7 +4271,7 @@ msgstr ""
" Ezeknek a csomagoknak a jelenlegi verziójánál korábbi verziója lesz "
"telepítve."
-#: 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 "
@@ -4397,7 +4281,7 @@ msgstr ""
" Ezek a csomagok frissíthetők, de azt kérted, hogy egyelőre tartsák meg "
"jelenlegi verziójukat."
-#: 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."
@@ -4405,7 +4289,7 @@ msgstr ""
"Újratelepítendő csomagok\n"
" Ezek a csomagok újratelepülnek."
-#: 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 "
@@ -4414,7 +4298,7 @@ msgstr ""
"Telepítendő csomagok\n"
" Ezeket a csomagokat kézzel választottad ki telepítésre."
-#: 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."
@@ -4422,7 +4306,7 @@ msgstr ""
"Eltávolítandó csomagok\n"
" Ezeket a csomagokat kézzel választottad ki törlésre."
-#: 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."
@@ -4430,7 +4314,7 @@ msgstr ""
"Frissítendő csomagok\n"
" Ezek a csomagok újabb verziójukra lesznek frissítve."
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4441,7 +4325,7 @@ msgstr ""
" Ezek a csomagok más telepítésre választott csomagok igényei miatt lesznek "
"telepítve."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4462,115 +4346,121 @@ 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 "Csomag"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Nincs telepítve"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "%s eltávolítása"
-#: 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 "A(z) %F telepítésének lemondása"
-#: 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 "A(z) %F törlésének lemondása"
-#: 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 "A(z) %F %s (%s) verzión tartása"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
msgid "Installing %s version %s is rejected."
msgstr "%s %s (%s) telepítése"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "libsigc++ verzió: %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 verziói"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4580,7 +4470,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4588,188 +4478,200 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "a(z) %s függ a(z) %s csomagtól"
-#: 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 "a(z) %s előzetesen függ a(z) %s csomagtól"
-#: 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 "a(z) %s javasolja a(z) %s csomagot"
-#: 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 "a(z) %s ajánlja a(z) %s csomagot"
-#: 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 "a(z) %s ütközik a(z) %s csomaggal"
-#: src/gtk/resolver.cc:1187 src/solution_fragment.cc:123
+#: src/gtk/resolver.cc:1241 src/solution_fragment.cc:123
#, fuzzy, c-format
msgid "%s breaks %s"
msgstr "a(z) %s helyettesíti a(z) %s csomagot"
-#: 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 "a(z) %s helyettesíti a(z) %s csomagot"
-#: 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 "a(z) %s elavulttá teszi a(z) %s csomagot"
-#: 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 "Az alábbi csomagok eltávolítása:"
-#: 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 "Az alábbi csomagok telepítése:"
-#: 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 "Az alábbi csomagok eltávolítása:"
-#: 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 "Az alábbi csomagok frissítése:"
-#: 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 "Az alábbi csomagok visszafejlesztése:"
-#: 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 "Az alábbi függőségek feloldatlanul hagyása:%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 "Eltávolítás: %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 "Telepítés: %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 "A(z) %F telepítésének lemondása"
-#: 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 "A(z) %F törlésének lemondása"
-#: 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 "A(z) %F %s (%s) verzión tartása"
-#: 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 "A(z) %F frissítése [%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 "A(z) %F visszafejlesztése [%s (%s) -> %s (%s)]"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>Remove</b> %s"
msgstr "Eltávolít"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "Eltávolít"
-#: 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 "A(z) %F %s (%s) verzión tartása"
-#: 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 "A(z) %F %s (%s) verzión tartása"
-#: 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 "A(z) %F telepítésének lemondása"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "A(z) %F telepítésének lemondása"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Telepítés: %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 "Telepítés: %F [%s (%s)]"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "libsigc++ verzió: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "libsigc++ verzió: %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 verziói"
-#: 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 verziói"
-#: 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"
@@ -4778,7 +4680,7 @@ msgid_plural "%s installs"
msgstr[0] "%d telepítés"
msgstr[1] "%d telepítés"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4787,7 +4689,7 @@ msgid_plural "%s removes"
msgstr[0] "%d eltávolítás"
msgstr[1] "%d eltávolítás"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4796,7 +4698,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d visszatartás"
msgstr[1] "%d visszatartás"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4805,7 +4707,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d frissítés"
msgstr[1] "%d frissítés"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4814,7 +4716,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d visszatérés régebbi verzióra"
msgstr[1] "%d visszatérés régebbi verzióra"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4822,34 +4724,34 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "^Ajánlások vizsgálata"
msgstr[1] "^Ajánlások vizsgálata"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Nincs több megoldás"
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
msgid "No dependency solution was found."
msgstr "^Függőség kezelés"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Nincs több megoldás"
-#: 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 "Nincs több megoldás"
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7688,6 +7590,75 @@ msgid "Download Changelog"
msgstr "Munkanapló letöltése"
#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "Csomagok ^telepítése/eltávolítása"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "Csomaglista f^rissítése"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Fri^ssíthetőnek jelöl"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "Új csomagok el^felejtése"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Függő műveletek törlés^e"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Csomaggyorstár tisztítása"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Elav^ult fájlok tisztítása"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "Csomaggyorstár új^ratöltése"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Aknakereső ^játék"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Bejelentkezek rendszergazdaként"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Kilépés"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "eltávolítás"
+
+#, fuzzy
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "^Függőség kezelés"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "a javasolt változtatások magyarázatának megtekintése"
+
+#, fuzzy
#~ msgid "Dependency Chain"
#~ msgstr "^Függőség kezelés"
diff --git a/po/it.po b/po/it.po
index db13b7d7..0cb37b6a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -43,7 +43,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.11.10\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: 2009-02-23 15:46+0100\n"
"Last-Translator: Danilo Piazzalunga <danilopiazza@gmail.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -683,8 +683,8 @@ msgstr "Errore grave nel risolutore"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Risoluzione delle dipendenze"
-#: 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 "Errore interno: non è prevista una soluzione vuota."
@@ -1759,7 +1759,7 @@ msgstr ""
"Le dipendenze verrebbero risolte, ma il risolutore non è statao creato."
#: 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 "Risoluzione delle dipendenze..."
@@ -1867,7 +1867,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:\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>"
@@ -2003,8 +2003,8 @@ msgstr "Installato automaticamente"
msgid "no"
msgstr "no"
-#: 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 "Versione: "
@@ -2083,12 +2083,12 @@ msgid "Obsoletes"
msgstr "Rende obsoleto"
#: 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 "Fornisce"
#: 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 "Descrizione: "
@@ -2247,8 +2247,7 @@ msgstr "Attuale"
msgid "Candidate"
msgstr "Candidato"
-#: 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 "Installare"
@@ -2390,7 +2389,7 @@ msgid "UNAVAILABLE"
msgstr "NON DISPONIBILE"
# NdT: Tag/etichette di Debtags
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Etichette"
@@ -2668,54 +2667,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 "Sezione"
-#: 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 "Annu^lla azioni in attesa"
-#: 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 "\"-\" per rimuovere i pacchetti"
-#: 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 "non è un vero pacchetto"
-#: 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 "Rimuovere i seguenti pacchetti:"
-#: 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 "
@@ -3187,102 +3186,45 @@ msgstr ""
msgid "_File"
msgstr "Falso"
-#: 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 "Procede ad installare e rimuovere i pacchetti"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Installa/rimuovi pacchetti"
-
-#: 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 "Cerca nuove versioni dei pacchetti"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Aggiorna l'elenco dei pacchetti"
-
-#: 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 ""
"Richiede l'aggiornamento di tutti i pacchetti aggiornabili non bloccati"
-# NdT: La traduzione non è fedele ma è una voce di menu e deve essere breve
-# Il significato letterale è: "Segna (= Mark) [tutti i pacchetti che è
-# possibile aggiornare] come aggiornabili (= Upgradable)"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Aggiorna ^tutti i pacchetti"
-
-#: 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 "Dimentica quali pacchetti sono «nuovi»"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Dimentica i nuovi pacchetti"
-
-#: 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 ""
"Annulla tutte le installazioni, rimozioni, blocchi e aggiornamenti in attesa."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Annu^lla azioni in attesa"
-
-#: 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 "Cancella i file dei pacchetti scaricati precedentemente"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Pulisci la cache dei pacchetti"
-
-#: 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 "Cancella i file dei pacchetti che non si possono più scaricare"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "^Cancella i file vecchi"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Ricarica la cache dei pacchetti"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "Ricarica ^la cache dei pacchetti"
-
-#: 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 "Perdi tempo cercando di scovare le mine"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Gioca a campo minato"
-
-#: 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"
@@ -3290,261 +3232,200 @@ msgstr ""
"Esegue «su» per diventare root; questo farà ripartire il programma, "
"mantenendo però le impostazioni attuali"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Diventa root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Esce dal programma"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Esci"
-
-#: 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 ""
"Annulla l'ultima operazione o gruppo di operazioni effettuate sui pacchetti"
-#: 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 "rimuove"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pacchetto"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Viste"
-#: 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 "Gestione delle dipendenze"
-
-#: 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
-msgid "gtk-close"
-msgstr ""
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Aiuto"
-#: 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 "Aggiornamento elenco"
-#: 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 "Pacchetti"
-#: 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 "Anteprima"
-#: 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 "Risolutore"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Installato"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Rimuovere"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Elimina"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Mantenere"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Bloccare"
-
-#: 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 "Rimuove il filtro dall'elenco dei pacchetti"
-#: 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 "Applica un filtro all'elenco dei pacchetti"
-#: 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
+msgid "gtk-close"
+msgstr ""
+
+#: 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 "Cerca"
-#: 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 "reinstalla"
-#: 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 "Err "
-#: 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 "Dipendenze di %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 "Falso"
-#: 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 ""
# NdT: Tag/etichette di Debtags
-#: src/gtk/aptitude.glade:1135
+#: src/gtk/aptitude.glade:1045
#, fuzzy
#| msgid "Tags"
msgid "tags"
msgstr "Etichette"
-#: 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 "Stato"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Azione «%s» sconosciuta"
+
+#: 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 "
@@ -3553,148 +3434,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 "Azione «%s» sconosciuta"
+#: 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 "^Rifiuta/autorizza"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Preferenze"
-#: 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 "Stato"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Esamina soluzione"
-#: 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 "Seleziona la soluzione successiva per le dipendenze non soddisfatte."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Esamina soluzione"
+#: 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 "Esegue le azioni contenute nella soluzione proposta."
-#: 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 "Aggiornare"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Pacchetto sorgente: "
-#: 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 "Manuale"
-#: 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 "Aggiornare"
-#: 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 "sì"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3747,21 +3611,21 @@ msgstr "Scaricamento del changelog"
msgid "Downloading changelogs"
msgstr "Scaricamento del 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 da usare per scaricare i changelog"
-#: 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"
@@ -3770,19 +3634,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d da aggiornare"
msgstr[1] "%d da aggiornare"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "No packages are broken."
msgid "No upgrades are available."
msgstr "Nessun pacchetto difettoso."
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Impossibile trovare il pacchetto %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 "
@@ -3793,7 +3657,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3804,46 +3668,46 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 ""
"Errore interno: impossibile leggere la stringa delle colonne predefinite"
-#: 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
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 "Gestione delle dipendenze"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
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."
@@ -4104,6 +3968,10 @@ msgstr "Reinstallare"
msgid "Downgrade"
msgstr "Retrocedere (downgrade)"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Rimuovere"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4296,6 +4164,20 @@ msgstr ""
msgid "Install/Upgrade"
msgstr "Installato"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Elimina"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Mantenere"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Bloccare"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4361,133 +4243,133 @@ msgstr "no"
msgid "Unknown"
msgstr "Sconosciuto"
-#: 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 "Nessun pacchetto corrisponde al modello «%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 "Pacchetto: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s: versioni"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Installare(%s fornisce %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 " Versione di 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 "Mantenere i seguenti pacchetti alla versione attuale:"
-#: 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 "Annu^lla azioni in attesa"
-#: 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 "Annullare la rimozione di %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 "Annullare la rimozione di %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 "Annullare la rimozione di %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 "Annullare l'installazione di %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 "Annullare la rimozione di %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 "Annullare l'installazione di %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Rimuovere(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Elimina"
-#: 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\" per segnare i pacchetti come installati automaticamente"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
#| msgid "'&m' to mark packages as manually installed"
msgid "Mark %s as manually installed."
msgstr "\"&m\" per segnare i pacchetti come installati manualmente"
-#: 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» è un pacchetto virtuale fornito da:\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: "
@@ -4517,28 +4399,28 @@ msgstr "%s; verrà installato automaticamente"
msgid "%s is being installed manually."
msgstr "%s; verrà installato automaticamente"
-#: 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 "Cerca"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Costruzione della vista"
-#: 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 "Costruzione della vista"
-#: 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 "
@@ -4554,7 +4436,7 @@ msgstr ""
" La presenza di questo albero probabilmente indica che qualcosa non va nel "
"proprio sistema o negli archivi 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 "
@@ -4567,7 +4449,7 @@ msgstr ""
"prevede alcun pacchetto installato che dichiari una dipendenza «importante» "
"su di essi.\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 "
@@ -4577,7 +4459,7 @@ msgstr ""
" Questi pacchetti potrebbero venire aggiornati, ma sono stati mantenuti nel "
"loro stato attuale per evitare di rompere le dipendenze."
-#: 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 "
@@ -4587,7 +4469,7 @@ msgstr ""
" Questi pacchetti verranno installati perché sono richiesti da un altro "
"pacchetto selezionato per l'installazione."
-#: 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 "
@@ -4597,7 +4479,7 @@ msgstr ""
" Questi pacchetti verranno rimossi perché una o più delle loro dipendenze "
"non è più disponibile, oppure perché in conflitto con un altro pacchetto."
-#: 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 "
@@ -4607,7 +4489,7 @@ msgstr ""
" Verrà installata una versione più vecchia di questi pacchetti rispetto a "
"quella attualmente installata."
-#: 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 "
@@ -4617,7 +4499,7 @@ msgstr ""
" Questi pacchetti potrebbero venire aggiornati, ma sono stati bloccati alla "
"versione attualmente installata."
-#: 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."
@@ -4625,7 +4507,7 @@ msgstr ""
"Pacchetti da reinstallare\n"
" Questi pacchetti verranno reinstallati."
-#: 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 "
@@ -4635,7 +4517,7 @@ msgstr ""
" Questi pacchetti sono stati selezionati manualmente per essere installati "
"sul computer."
-#: 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."
@@ -4643,7 +4525,7 @@ msgstr ""
"Pacchetti da rimuovere\n"
" Questi pacchetti sono stati selezionati manualmente per essere rimossi."
-#: 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."
@@ -4651,7 +4533,7 @@ msgstr ""
"Pacchetti da aggiornare\n"
" Questi pacchetti verranno aggiornati ad una nuova versione."
-#: 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 "
@@ -4661,7 +4543,7 @@ msgstr ""
" Questi pacchetti non sono completamente installati e configurati; sarà "
"effettuato un tentativo di completarne l'installazione."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4682,115 +4564,121 @@ 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 "Pacchetto"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Non installato"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Rimozione di %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 "Annullare l'installazione di %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 "Annullare la rimozione di %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 "Mantenere %F alla versione %s (%s)"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
#| msgid "Installing %s %s (%s)"
msgid "Installing %s version %s is rejected."
msgstr "Installazione di %s %s (%s)"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, c-format
msgid "Upgrading %s to version %s is rejected."
msgstr ""
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4800,7 +4688,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4808,187 +4696,199 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 dipende da %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 pre-dipende da %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 consiglia %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 raccomanda %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 è in conflitto con %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 rende difettoso %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 sostituisce %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 rende obsoleto %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 "Rimuovere i seguenti pacchetti:"
-#: 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 "Installare i seguenti pacchetti:"
-#: 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 "Rimuovere i seguenti pacchetti:"
-#: 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 "Aggiornare i seguenti pacchetti:"
-#: 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 "Retrocedere (downgrade) i seguenti pacchetti:"
-#: 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 "Lasciare le seguenti dipendenze non soddisfatte:%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 "Rimuovere %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 "Installare %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 "Annullare l'installazione di %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 "Annullare la rimozione di %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 "Mantenere %F alla versione %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 "Aggiornare %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 "Retrocedere (downgrade) %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 "Rimuovere(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, c-format
msgid "<b>remove</b> %s"
msgstr ""
-#: 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 "Mantenere %F alla versione %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 "Mantenere %F alla versione %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 "Annullare l'installazione di %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Annullare l'installazione di %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Installare %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 "Installare %F [%s (%s)]"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>Upgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>upgrade</b> %s to version %s"
msgstr ""
-#: 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"
@@ -4997,7 +4897,7 @@ msgid_plural "%s installs"
msgstr[0] "%d da installare"
msgstr[1] "%d da installare"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -5006,7 +4906,7 @@ msgid_plural "%s removes"
msgstr[0] "%d da rimuovere"
msgstr[1] "%d da rimuovere"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -5015,7 +4915,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d da mantenere"
msgstr[1] "%d da mantenere"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5024,7 +4924,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d da aggiornare"
msgstr[1] "%d da aggiornare"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5033,7 +4933,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d da retrocedere (downgrade)"
msgstr[1] "%d da retrocedere (downgrade)"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5041,35 +4941,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Controlla ^Raccomandati"
msgstr[1] "Controlla ^Raccomandati"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Nessun'altra soluzione."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "No resolution found."
msgid "No dependency solution was found."
msgstr "Nessuna soluzione trovata."
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Nessun'altra soluzione."
-#: 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 "Nessun'altra soluzione."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7932,6 +7832,74 @@ msgstr "Scaricamento del changelog"
msgid "Download Changelog"
msgstr "Scarica il changelog"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Installa/rimuovi pacchetti"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Aggiorna l'elenco dei pacchetti"
+
+# NdT: La traduzione non è fedele ma è una voce di menu e deve essere breve
+# Il significato letterale è: "Segna (= Mark) [tutti i pacchetti che è
+# possibile aggiornare] come aggiornabili (= Upgradable)"
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Aggiorna ^tutti i pacchetti"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Dimentica i nuovi pacchetti"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Annu^lla azioni in attesa"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Pulisci la cache dei pacchetti"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "^Cancella i file vecchi"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "Ricarica ^la cache dei pacchetti"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Gioca a campo minato"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Diventa root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Esci"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "rimuove"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Gestione delle dipendenze"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(per %s)"
diff --git a/po/ja.po b/po/ja.po
index d8cbd1f1..6ba2bda8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -185,7 +185,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.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-16 03:35+0900\n"
"Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
"Language-Team: Japanese\n"
@@ -826,8 +826,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 "内部エラー: 解決方法が null になるのは想定外です"
@@ -1921,7 +1921,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "依存関係を解決中..."
@@ -2026,7 +2026,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>"
@@ -2162,8 +2162,8 @@ msgstr "自動的にインストールされた"
msgid "no"
msgstr "no"
-#: 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 "バージョン: "
@@ -2243,12 +2243,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 "説明: "
@@ -2399,8 +2399,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 "インストール"
@@ -2543,7 +2542,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 "タグ"
@@ -2821,54 +2820,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 "未実行アクションの取り消し (^e)"
-#: 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 "
@@ -3354,113 +3353,51 @@ msgid "_File"
msgstr "いいえ"
# * Description of an item.
-#: 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 "実行されていないインストールや削除を実行します"
-# * Item.
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "パッケージのインストール・削除 (^I)"
-
# * Description of an item.
-#: 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 "パッケージの新しいバージョンがないか確認します"
-# * Item.
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "パッケージ一覧の更新 (^U)"
-
# * Description of an item.
-#: 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 "更新時に固定されない更新可能パッケージすべてに印をつけます"
-# * Item.
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "更新可能パッケージという印を添付 (^g)"
-
# * Description of an item.
-#: 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 "どのパッケージが「新規」かの情報を消去します"
-# * Item.
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "新規パッケージ一覧の消去 (^F)"
-
# * Description of an item.
-#: 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 "未実行アクションの取り消し (^e)"
-
# * Description of an item.
-#: 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 "以前ダウンロードしたパッケージファイルを削除します"
-# * Item.
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "パッケージのキャッシュの消去 (^C)"
-
# * Description of an item.
-#: 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 "もはやダウンロードできないパッケージファイルを削除する"
-# * Item.
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "廃止されたファイルを一掃する (^o)"
-
# * Description of an item.
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "パッケージのキャッシュを再度読み込みます"
-# * Item.
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "パッケージのキャッシュの再読み込み (^R)"
-
-#: 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 "地雷探しにかまけます"
-# * Item.
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "マインスイーパで遊ぶ (^P)"
-
# * Description of an item.
-#: 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"
@@ -3468,272 +3405,209 @@ msgstr ""
"root になるために 'su' を実行します。それによってプログラムは再起動されます"
"が、現在の設定は保持されます"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "root になる"
-
# * Description of an item.
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "プログラムを終了します"
-# * Item.
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "終了 (^Q)"
-
-#: src/gtk/aptitude.glade:212
+#: src/gtk/aptitude.glade:147
msgid "E_dit"
msgstr ""
# * Description of an item.
-#: 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 "削除"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "パッケージ"
# * Menu item on the first line.
-#: 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 "削除"
-
-#: 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 ""
# * Message used as 'tablabel' for the ui_download_manager.
-#: 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 "プレビューする"
# * Menu item on the first line.
-#: 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 "削除"
-
-# * Item.
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "完全削除 (^P)"
-
-#: 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 ""
# * Description of an item.
-#: 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 "パッケージ一覧のフィルタを解除します"
# * Description of an item.
-#: 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:664
+#, fuzzy
+#| msgid "delete"
+msgid "gtk-close"
+msgstr "削除"
+
# * Menu item on the first line.
-#: src/gtk/aptitude.glade:811 src/gtk/aptitude.glade:1490
-#: src/gtk/aptitude.glade:1809 src/gtk/aptitude.glade:1945
+#: 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 "再インストール"
-#: 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 の依存関係"
# * Item.
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "変更履歴 (^C)"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "いいえ"
-#: 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 "
@@ -3742,155 +3616,135 @@ 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 ""
-# * Case: 'o'
-#: src/gtk/aptitude.glade:1246
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "解決方法の変更点についての説明を表示します"
-
-#: src/gtk/aptitude.glade:1263
+#: src/gtk/aptitude.glade:1255
msgid "<b>View Mode</b>"
msgstr ""
# * Item.
-#: src/gtk/aptitude.glade:1307
+#: src/gtk/aptitude.glade:1297
#, fuzzy
#| msgid "Toggle ^Rejected"
msgid "Rejected"
msgstr "拒否する・しないを切り替え (^R)"
-#: 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
+# * Item.
+#: 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 "解決方法の検討 (^E)"
# * Description of an item.
-#: 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 "依存関係の問題に対して、次の解決方法を選択します。"
-# * Item.
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "解決方法の検討 (^E)"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
+msgstr ""
# * Description of an item.
-#: 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 "yes"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3943,23 +3797,23 @@ msgstr "変更履歴をダウンロードしています"
msgid "Downloading changelogs"
msgstr "変更履歴をダウンロードしています"
-#: 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
#, fuzzy
#| msgid "%d upgrades"
msgid "Available upgrades:"
msgstr "%d 個 更新"
-#: src/gtk/dashboardtab.cc:413
+#: src/gtk/dashboardtab.cc:414
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -3967,19 +3821,19 @@ msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%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 "
@@ -3989,7 +3843,7 @@ msgid_plural ""
"size='large'>%d</span>."
msgstr[0] ""
-#: 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'>"
@@ -3999,49 +3853,49 @@ msgid_plural ""
"%d</span> upgrades."
msgstr[0] ""
-#: 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."
@@ -4309,6 +4163,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 ""
@@ -4505,6 +4363,21 @@ msgstr "インストールされていません"
msgid "Install/Upgrade"
msgstr "インストール済み"
+# * Item.
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "完全削除 (^P)"
+
+#: 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 ""
@@ -4571,134 +4444,134 @@ msgstr "no"
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 "未実行アクションの取り消し (^e)"
-#: 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)"
# * Item.
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "完全削除 (^P)"
-#: 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: "
@@ -4728,29 +4601,29 @@ 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 ""
# * Menu item on the first line.
-#: 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 "
@@ -4766,7 +4639,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 "
@@ -4778,7 +4651,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 "
@@ -4788,7 +4661,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 "
@@ -4798,7 +4671,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 "
@@ -4808,7 +4681,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 "
@@ -4818,7 +4691,7 @@ msgstr ""
" これらのパッケージは、現在インストールされているバージョンよりも古いものがイ"
"ンストールされます。"
-#: 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 "
@@ -4828,7 +4701,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."
@@ -4836,7 +4709,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 "
@@ -4846,7 +4719,7 @@ msgstr ""
" これらのパッケージは、コンピュータにインストールする対象として手動で選択され"
"ました。"
-#: 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."
@@ -4854,7 +4727,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."
@@ -4862,7 +4735,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 "
@@ -4872,7 +4745,7 @@ msgstr ""
" これらのパッケージは、インストールや設定が完了していません。インストールの完"
"了を試みる予定です。"
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4893,115 +4766,121 @@ 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -5010,199 +4889,211 @@ msgid_plural ""
"solutions."
msgstr[0] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
"Always prefer these actions over alternatives that have not been accepted."
msgstr[0] ""
-#: 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"
@@ -5210,7 +5101,7 @@ msgid "%s install"
msgid_plural "%s installs"
msgstr[0] "%d 個のインストール"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -5218,7 +5109,7 @@ msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "%d 個の削除"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -5226,7 +5117,7 @@ msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "%d 個の一時固定"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5234,7 +5125,7 @@ msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "%d 個の更新"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5243,42 +5134,42 @@ msgid_plural "%s downgrades"
msgstr[0] "%d 個のダウングレード"
# * Item
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "推奨を監査 (^R)"
-#: 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 ""
@@ -8303,6 +8194,86 @@ msgstr "変更履歴をダウンロードしています"
msgid "Download Changelog"
msgstr "変更履歴をダウンロードしました"
+# * Item.
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "パッケージのインストール・削除 (^I)"
+
+# * Item.
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "パッケージ一覧の更新 (^U)"
+
+# * Item.
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "更新可能パッケージという印を添付 (^g)"
+
+# * Item.
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "新規パッケージ一覧の消去 (^F)"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "未実行アクションの取り消し (^e)"
+
+# * Item.
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "パッケージのキャッシュの消去 (^C)"
+
+# * Item.
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "廃止されたファイルを一掃する (^o)"
+
+# * Item.
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "パッケージのキャッシュの再読み込み (^R)"
+
+# * Item.
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "マインスイーパで遊ぶ (^P)"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "root になる"
+
+# * Item.
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "終了 (^Q)"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "削除"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "依存関係の処理"
+
+# * Case: 'o'
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "解決方法の変更点についての説明を表示します"
+
# TRANSLATION-FIXME: こんな感じ?
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
diff --git a/po/km.po b/po/km.po
index 58ee3172..3e510e7a 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_po_km\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: 2006-10-06 11:24+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -525,8 +525,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 "កំហុស​ខាង​ក្នុង ៖ មិន​រំពឹង​ថា​មាន​ដំណោះស្រាយ​ទទេ ។"
@@ -1563,7 +1563,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "កំពុង​ដោះស្រាយ​ភាព​អាស្រ័យ..."
@@ -1664,7 +1664,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 "<ទទេ>"
@@ -1800,8 +1800,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 "កំណែ ៖ "
@@ -1880,12 +1880,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 "សេចក្ដីពណ៌នា ៖ "
@@ -2041,8 +2041,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 "ដំឡើង"
@@ -2182,7 +2181,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 "ស្លាក"
@@ -2449,54 +2448,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 "
@@ -2940,97 +2939,43 @@ msgstr ""
msgid "_File"
msgstr "បិទ​"
-#: 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"
@@ -3038,259 +2983,199 @@ msgstr ""
"រត់ 'su' ដើម្បី​ក្លាយជា root ។ បន្ទាប់​មក​កម្មវិធី​នឹង​ត្រូវ​បាន​ចាប់ផ្ដើម​ឡើង​វិញ ប៉ុន្តែ​ការ​កំណត់​របស់​អ្នក​នឹង​"
"ត្រូវ​បាន​ការពារ"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "ក្លាយជា​ root"
-
-#: 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 "លុប"
-
-#: 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 "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 "លុប"
-
-#: 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 "លុប​បំបាត់"
-
-#: 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 "លុប"
+
+#: 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 "ដំឡើងឡើងវិញ"
-#: 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 "Err "
-#: 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 "កំណត់​ហេតុ​ការ​ផ្លាស់ប្ដូរ"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
msgid "Files"
msgstr "បិទ​"
-#: 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 "
@@ -3299,149 +3184,130 @@ 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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-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 "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 ""
@@ -3494,21 +3360,21 @@ msgstr "​​ទាញយក​កំណត់​ហេតុ​ផ្លាស
msgid "Downloading changelogs"
msgstr "​​ទាញយក​កំណត់​ហេតុ​ផ្លាស់ប្ដូរ"
-#: 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"
@@ -3517,19 +3383,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d ធ្វើ​ឲ្យ​ប្រសើរ"
msgstr[1] ""
-#: 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 "
@@ -3540,7 +3406,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3551,46 +3417,46 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Find dependency chains: start"
msgstr "ការ​ដោះស្រាយ​ភាព​អាស្រ័យ"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
msgid "Find dependency chains: end"
msgstr "ការ​ដោះស្រាយ​ភាព​អាស្រ័យ"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
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 "No dependency chain found."
msgstr "ការ​ដោះស្រាយ​ភាព​អាស្រ័យ"
@@ -3849,6 +3715,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 ""
@@ -4043,6 +3913,20 @@ msgstr "ពុំ​បាន​ដំឡើង​"
msgid "Install/Upgrade"
msgstr "បាន​ដំឡើង"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "លុប​បំបាត់"
+
+#: 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 ""
@@ -4104,129 +3988,129 @@ 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 version %s"
msgstr "កំពុង​ដំឡើង %s %s (%s)"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "libsigc++ កំណែ ៖ %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"
msgstr "យក​ចេញ"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "លុប​បំបាត់"
-#: 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 "Mark %s as manually installed."
msgstr "'&m' ដើម្បី​សម្គាល់​កញ្ចប់​ថា​បាន​ដំឡើង​ដោយ​ដៃ"
-#: 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: "
@@ -4256,28 +4140,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 "
@@ -4292,7 +4176,7 @@ msgstr ""
" វត្តមាន​របស់​មែកធាង​នេះ ប្រហែល​ជា​បញ្ជាក់​អំពី​អ្វី​ដែល​ខូច នៅ​លើ​ប្រព័ន្ធ​របស់​អ្នក ឬ នៅ​ក្នុង​ប័ណ្ណសារ​"
"ដេបៀន ។"
-#: 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 "
@@ -4303,7 +4187,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 "
@@ -4313,7 +4197,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 "
@@ -4323,7 +4207,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 "
@@ -4333,7 +4217,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 "
@@ -4342,7 +4226,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 "
@@ -4351,7 +4235,7 @@ msgstr ""
"កញ្ចប់​ដែល​ត្រូវ​ទុក​មក​វិញ\n"
" កញ្ចប់​ទាំងនេះ​មិន​អាច​ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ​បាន​ឡើយ ប៉ុន្តែ​អ្នក​បាន​ស្នើសុំ​ឲ្យ​ទុក​ពួក​វា​នៅ​ដដែល ។"
-#: 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."
@@ -4359,7 +4243,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 "
@@ -4368,7 +4252,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."
@@ -4376,7 +4260,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."
@@ -4384,7 +4268,7 @@ msgstr ""
"កញ្ចប់​ត្រូវ​ធ្វើ​ឲ្យ​ប្រសើរ\n"
" កញ្ចប់​ទាំងនេះ​នឹង​ត្រូវ​បាន​ធ្វើ​ឲ្យ​​ប្រសើរ ទៅ​ជា​កំណែ​ថ្មី​ជាង​នេះ ។"
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4395,7 +4279,7 @@ msgstr ""
" កញ្ចប់​ទាំងនេះ​នឹង​ត្រូវ​បាន​ដំឡើង ព្រោះ​ពួកវា​ត្រូវ​បាន​ទាមទារដោយ​កញ្ចប់​ផ្សេង​ទៀត ដែល​អ្នក​បាន​ជ្រើស​ថា​"
"ដំឡើង ។"
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4416,115 +4300,121 @@ 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 "Installing %s version %s is rejected."
msgstr "កំពុង​ដំឡើង %s %s (%s)"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "libsigc++ កំណែ ៖ %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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4534,7 +4424,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4542,188 +4432,200 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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
#, fuzzy, 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 "<b>Remove</b> %s"
msgstr "យក​ចេញ"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "យក​ចេញ"
-#: 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 "<b>Downgrade</b> %s to version %s"
msgstr "libsigc++ កំណែ ៖ %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "libsigc++ កំណែ ៖ %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"
@@ -4732,7 +4634,7 @@ msgid_plural "%s installs"
msgstr[0] "%d ដំឡើង"
msgstr[1] ""
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4741,7 +4643,7 @@ msgid_plural "%s removes"
msgstr[0] "%d ​យក​ចេញ"
msgstr[1] ""
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4750,7 +4652,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d រក្សា​ទុក"
msgstr[1] ""
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4759,7 +4661,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d ធ្វើ​ឲ្យ​ប្រសើរ"
msgstr[1] ""
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4768,7 +4670,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d បន្ទាប"
msgstr[1] ""
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4776,34 +4678,34 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "ពិនិត្យ​ការ​ផ្ដល់​អនុសាសន៍"
msgstr[1] "ពិនិត្យ​ការ​ផ្ដល់​អនុសាសន៍"
-#: 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 "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 ""
@@ -7546,6 +7448,75 @@ msgid "Download Changelog"
msgstr "ទាញយក​កំណត់​ហេតុ​ផ្លាស់ប្ដូរ"
#, 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 "ក្លាយជា​ root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "ចេញ"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "លុប"
+
+#, fuzzy
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "ការ​ដោះស្រាយ​ភាព​អាស្រ័យ"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "មើល​សេចក្ដីពន្យល់​អំពី​ការ​ផ្លាស់ប្ដូរ នៅ​ក្នុង​ដំណោះស្រាយ"
+
+#, fuzzy
#~ msgid "Dependency Chain"
#~ msgstr "ការ​ដោះស្រាយ​ភាព​អាស្រ័យ"
diff --git a/po/ku.po b/po/ku.po
index ad29c77e..fe2eacfc 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-09-01 16:03+0200\n"
"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
"Language-Team: Kurdish <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -517,8 +517,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr ""
-#: 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 ""
@@ -1503,7 +1503,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 ""
@@ -1602,7 +1602,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr ""
#: 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 ""
@@ -1738,8 +1738,8 @@ msgstr ""
msgid "no"
msgstr "na"
-#: 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 "Guherto: "
@@ -1818,12 +1818,12 @@ msgid "Obsoletes"
msgstr "Nepêwîst dike"
#: 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 "Rave: "
@@ -1976,8 +1976,7 @@ msgstr ""
msgid "Candidate"
msgstr "Berendam"
-#: 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 "Saz bike"
@@ -2112,7 +2111,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 "Etîket"
@@ -2374,54 +2373,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 "Beş "
-#: src/generic/apt/aptitude_resolver_universe.cc:872
+#: src/generic/apt/aptitude_resolver_universe.cc:879
#, fuzzy
#| msgid "Cancel the installation of %F"
msgid "Cancel all user actions"
msgstr "Sazkirina %F betal bike"
-#: src/generic/apt/aptitude_resolver_universe.cc:873
+#: src/generic/apt/aptitude_resolver_universe.cc:880
#, fuzzy
#| msgid "No broken packages."
msgid "Remove packages"
msgstr "Pakêtên şikestî tune."
-#: 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 "pakêteke rastîn nîn e"
-#: 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 "Ev paketan rake:"
-#: 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 "
@@ -2853,345 +2852,234 @@ msgstr ""
msgid "_File"
msgstr "Şaş"
-#: 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 the following packages:"
-msgid "_Install/Remove Packages"
-msgstr "Ev paketan saz bike:"
-
-#: 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 "Updating package lists"
-msgid "_Update Package List"
-msgstr "Lîsteyên paketan tên rojanekirin"
-
-#: 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 "Upgrade"
-msgid "Mark Up_gradable"
-msgstr "Bilindkirin"
-
-#: 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 "No broken packages."
-msgid "_Forget New Packages"
-msgstr "Pakêtên şikestî tune."
-
-#: 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 "Cancel the installation of %F"
-msgid "Canc_el Pending Actions"
-msgstr "Sazkirina %F betal bike"
-
-#: 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
-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 "%s obsoletes %s"
-msgid "Clean _Obsolete Files"
-msgstr "%s %s'ê nepêwîst dike"
-
-#: 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
-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 "^Minesweeper bileyîze"
-
-#: 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"
msgstr ""
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Bibe root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Ji bernameyê derkeve"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Derketin"
-
-#: 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 "jêbirin"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pakêt"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Bergeh"
-#: 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
-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 "jêbirin"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Alîkarî"
-#: 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 "Upgrade"
msgid "Update"
msgstr "Bilindkirin"
-#: 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 "Pakêt"
-#: 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 "Pêşdîtin"
-#: 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 "Çareserî"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Sazkirî"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Rake"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Tam rakirin"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Parastin"
-
-#: 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
msgid "Make this the default for new package lists."
msgstr ""
-#: src/gtk/aptitude.glade:747
+#: src/gtk/aptitude.glade:646
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 "jêbirin"
+
+#: 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 "Lê bigere"
-#: 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 "dîsa sazkirin"
-#: 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
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 "Depends"
msgid "Dependencies"
msgstr "Bindest e"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "Cancel"
msgid "Changelog"
msgstr "Betal"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Şaş"
-#: 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 "Etîket"
-#: 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 "Rewş"
+
+#: src/gtk/aptitude.glade:1216
+msgid "Group by action type"
+msgstr ""
+
+#: 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 "
@@ -3200,136 +3088,121 @@ msgid ""
"This is the default view mode."
msgstr ""
-#: src/gtk/aptitude.glade:1232
-msgid "Group by action type"
+#: 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
msgid "Rejected"
msgstr ""
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Vebijêrk"
-#: 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
-#, fuzzy
-#| msgid "State"
-msgid "Status"
-msgstr "Rewş"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
msgstr ""
-#: src/gtk/aptitude.glade:1442
+#: src/gtk/aptitude.glade:1373
msgid "Calculate the next solution that has not yet been generated."
msgstr ""
-#: src/gtk/aptitude.glade:1443
-msgid "Find a new solution"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
msgstr ""
-#: src/gtk/aptitude.glade:1457
+#: src/gtk/aptitude.glade:1388
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 "Bilindkirin"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Pakêta Çavkaniyê:"
-#: 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
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 "Bilindkirin"
-#: 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 "erê"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3378,19 +3251,19 @@ msgstr ""
msgid "Downloading changelogs"
msgstr "Tê daxistin "
-#: 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
msgid "Preparing to download changelogs"
msgstr ""
-#: 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"
@@ -3399,17 +3272,17 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d bilindkirin"
msgstr[1] "%d bilindkirin"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "No packages are broken."
msgid "No upgrades are available."
msgstr "Pakêtên şikestî tune"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
msgid "Unable to calculate an upgrade."
msgstr ""
-#: 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 "
@@ -3420,7 +3293,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3431,42 +3304,42 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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
#, c-format
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
msgid "Find dependency chains: start"
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
msgid "Find dependency chains: end"
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
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
msgid "No dependency chain found."
msgstr ""
@@ -3705,6 +3578,10 @@ msgstr ""
msgid "Downgrade"
msgstr "Nizmkirin"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Rake"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -3892,6 +3769,20 @@ msgstr "ne sazkirî"
msgid "Install/Upgrade"
msgstr "Sazkirî"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Tam rakirin"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Parastin"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr ""
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -3949,132 +3840,132 @@ msgstr "na"
msgid "Unknown"
msgstr "Nenas"
-#: 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 such package \"%s\".\n"
msgid "No packages matched \"%s\"."
msgstr "Pakêteke wusa tune \"%s\".\n"
-#: 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 "Pakêt: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s guherto"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Installing %s %s (%s)"
msgid "Install %s version %s"
msgstr "%s %s (%s) tên sazkirin"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgid "Downgrade to %s version %s"
msgstr "%F nizim bike [%s (%s) -> %s (%s)]"
-#: 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 "Ev pakêtan di guhartoya xwe de bihêle:"
-#: 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 "Cancel the installation of %F"
msgid "Cancel any actions on %s."
msgstr "Sazkirina %F betal bike"
-#: 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 "Rakirina %F betal bike"
-#: 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 "Rakirina %F betal bike"
-#: 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 "Rakirina %F betal bike"
-#: 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 "Sazkirina %F betal bike"
-#: 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 "Rakirina %F betal bike"
-#: 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 "Sazkirina %F betal bike"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Rakirin(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Tam rakirin"
-#: 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 "Automatically Installed"
msgid "Mark %s as automatically installed."
msgstr "Bixweber hatiye sazkirin"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr "Ev paketên NÛ dê werin sazkirin:"
-#: src/gtk/packagestab.cc:643
+#: src/gtk/packagestab.cc:646
#, fuzzy, c-format
#| msgid " which is a virtual package."
msgid "%s is a virtual package provided by:\n"
msgstr " ku paketeke farazî (virtual) ye."
-#: 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: "
@@ -4103,26 +3994,26 @@ msgstr "lê %s sazkirî ye."
msgid "%s is being installed manually."
msgstr "le %s dê were sazkirin."
-#: 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 "Lê bigere"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
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 "
@@ -4132,7 +4023,7 @@ msgid ""
"either on your system or in the Debian archive."
msgstr ""
-#: 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 "
@@ -4140,74 +4031,74 @@ msgid ""
"package declaring an 'important' dependency on them.\n"
msgstr ""
-#: 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 "
"state to avoid breaking dependencies."
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 "
"package you have chosen for installation."
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 "
"is no longer available, or because another package conflicts with them."
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 "
"installed."
msgstr ""
-#: 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 "
"their current version."
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."
msgstr ""
-#: 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 "
"computer."
msgstr ""
-#: 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."
msgstr ""
-#: 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."
msgstr ""
-#: 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 "
"made to complete their installation."
msgstr ""
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4227,117 +4118,123 @@ 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 "Pakêt"
+
+#: 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 tê rakirin"
-#: 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 "Sazkirina %F betal bike"
-#: 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 "Rakirina %F betal bike"
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, fuzzy, c-format
#| msgid " Apt version: %s\n"
msgid "Keeping %s at version %s is rejected."
msgstr "Guhertoya Apt: %s\n"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
#| msgid "Installing %s %s (%s)"
msgid "Installing %s version %s is rejected."
msgstr "%s %s (%s) tên sazkirin"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgid "Downgrading %s to version %s is rejected."
msgstr "%F nizim bike [%s (%s) -> %s (%s)]"
-#: 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 guherto"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4347,7 +4244,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4355,192 +4252,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 ""
-#: 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 ""
-#: 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'ê pêşniyar dike"
-#: 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 tawsiye dike"
-#: 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 "Nakokî nav %s û %s heye"
-#: 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 ""
-#: 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 dikeve şuna %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'ê nepêwîst dike"
-#: 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 "Ev paketan rake:"
-#: 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 "Ev paketan saz bike:"
-#: 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 "Ev paketan rake:"
-#: 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 "Ev paketan bilind bike:"
-#: 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 "Ev paketan nizim bike:"
-#: src/gtk/resolver.cc:1369 src/gtk/resolver.cc:1819
+#: src/gtk/resolver.cc:1425 src/gtk/resolver.cc:1886
#, fuzzy
#| msgid "Remove the following packages:"
msgid "Leave the following dependencies unresolved:"
msgstr "Ev paketan rake:"
-#: 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)] rake"
-#: 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)] saz bike"
-#: 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 "Sazkirina %F betal bike"
-#: 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 "Rakirina %F betal bike"
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, fuzzy, c-format
#| msgid " Apt version: %s\n"
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr "Guhertoya Apt: %s\n"
-#: 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 bilind bike [%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 nizim bike [%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 "Rakirin(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Rakirin(%s)"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
#| msgid " Apt version: %s\n"
msgid "<b>Keep</b> %s at version %s"
msgstr "Guhertoya Apt: %s\n"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
#| msgid " Apt version: %s\n"
msgid "<b>keep</b> %s at version %s"
msgstr "Guhertoya Apt: %s\n"
-#: 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 "Sazkirina %F betal bike"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Sazkirina %F betal bike"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "%F [%s (%s)] saz bike"
-#: 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)] saz bike"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgid "<b>Downgrade</b> %s to version %s"
msgstr "%F nizim bike [%s (%s) -> %s (%s)]"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
msgid "<b>downgrade</b> %s to version %s"
msgstr "%F nizim bike [%s (%s) -> %s (%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 guherto"
-#: 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 guherto"
-#: 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"
@@ -4549,7 +4458,7 @@ msgid_plural "%s installs"
msgstr[0] "%d sazkirin"
msgstr[1] "%d sazkirin"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4558,7 +4467,7 @@ msgid_plural "%s removes"
msgstr[0] "%d rakirin"
msgstr[1] "%d rakirin"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4567,7 +4476,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d hêlan"
msgstr[1] "%d hêlan"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4576,7 +4485,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d bilindkirin"
msgstr[1] "%d bilindkirin"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4585,7 +4494,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d nizmkirin"
msgstr[1] "%d nizmkirin"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Recommendations"
msgid "%s unresolved recommendation"
@@ -4593,35 +4502,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Tawsiye"
msgstr[1] "Tawsiye"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No resolution found."
msgid "No solutions yet."
msgstr "Çareserî nehat dîtin."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "No resolution found."
msgid "No dependency solution was found."
msgstr "Çareserî nehat dîtin."
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No resolution found."
msgid "No solutions."
msgstr "Çareserî nehat dîtin."
-#: 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 resolution found."
msgid "%u solutions."
msgstr "Çareserî nehat dîtin."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7270,6 +7179,56 @@ msgstr ""
msgid "Download Changelog"
msgstr ""
+#, fuzzy
+#~| msgid "Install the following packages:"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "Ev paketan saz bike:"
+
+#, fuzzy
+#~| msgid "Updating package lists"
+#~ msgid "_Update Package List"
+#~ msgstr "Lîsteyên paketan tên rojanekirin"
+
+#, fuzzy
+#~| msgid "Upgrade"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Bilindkirin"
+
+#, fuzzy
+#~| msgid "No broken packages."
+#~ msgid "_Forget New Packages"
+#~ msgstr "Pakêtên şikestî tune."
+
+#, fuzzy
+#~| msgid "Cancel the installation of %F"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Sazkirina %F betal bike"
+
+#, fuzzy
+#~| msgid "%s obsoletes %s"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "%s %s'ê nepêwîst dike"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Minesweeper bileyîze"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Bibe root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Derketin"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "jêbirin"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(ji bo %s)"
diff --git a/po/lt.po b/po/lt.po
index 0447f3ef..d8ed44fe 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_lt\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-08-25 12:12+0300\n"
"Last-Translator: Darius Žitkevičius <skystis@gmail.com>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -622,8 +622,8 @@ msgstr "Esminė resolver klaida"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Sprendžiamos priklausomybės"
-#: 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 "Vidinė klaida: netikėtas tuščias sprendimas."
@@ -1688,7 +1688,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
msgstr "Norima išspręsti priklausomybes, bet nesukurtas joks resolver."
#: 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 "Sprendžiamos priklausomybės..."
@@ -1790,7 +1790,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Šių paketų priklausomybės netenkinamos:\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>"
@@ -1926,8 +1926,8 @@ msgstr "Automatiškai įdiegtas"
msgid "no"
msgstr "ne"
-#: 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 "Versija: "
@@ -2006,12 +2006,12 @@ msgid "Obsoletes"
msgstr "Nurašo"
#: 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 "Pateikia"
#: 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 "Aprašas: "
@@ -2171,8 +2171,7 @@ msgstr "Dabartinis"
msgid "Candidate"
msgstr "Kandidatas"
-#: 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 "Įdiegti"
@@ -2315,7 +2314,7 @@ msgstr "NETINKAMAS"
msgid "UNAVAILABLE"
msgstr "NEEGZISTUOJA"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Žymės"
@@ -2589,54 +2588,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 "Sekcija"
-#: 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 "Atšaukti ^visus veiksmus"
-#: 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 "'-' kad pašalinti paketus"
-#: 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 "nėra realus paketas"
-#: 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 "Pašalinti šiuos paketus:"
-#: 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 "
@@ -3090,99 +3089,45 @@ msgstr ""
msgid "_File"
msgstr "Ne"
-#: 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 "Vykdyti numatytus veiksmus"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Diegti/šalinti paketus"
-
-#: 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 "Ieškoti naujų paketų versijų"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Atnaujinti paketų sąrašą"
-
-#: 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 ""
"Pažymėti visus atnaujinamus paketus, kurie nesulaikomi nuo atnaujinimo."
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Pažymėti kaip ^atnaujinamą"
-
-#: 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 "Pamiršti kurie paketai yra „nauji“"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Pamiršti naujus paketus"
-
-#: 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 ""
"Atšaukti visus paruoštus diegimus, pašalinimus, sulaikymus ir atnaujinimus."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Atšaukti ^visus veiksmus"
-
-#: 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 "Ištrinti paketus, kurie buvo atsiųsti anksčiau"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Valyti paketų krepšį"
-
-#: 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 "Pašalinti paketus, kurių nebeįmanoma gauti"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "^Išvalyti pasenusius paketus"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Perkrauti paketų krepšį"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Perdaryti paketų krepšį"
-
-#: 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 "Gaištate laiką bandydami rasti minas"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Žaisti ^Minų lauką"
-
-#: 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"
@@ -3190,261 +3135,200 @@ msgstr ""
"Paleiskite komandą „su“, kad taptumėte root; Programa startuos iš naujo, "
"bet visi jūsų nustatymai išliks."
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Tapti root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Išeiti iš programos"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Baigti"
-
-#: 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 "Atšaukti paskutinį veiksmą, arba operacijų grupę."
-#: 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 "Ištrinti"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paketas"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Rodymas"
-#: 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 "Priklausomybių tvarkymas"
-
-#: 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 "Ištrinti"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Pagalba"
-#: 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 "Atnaujinimų sąrašas"
-#: 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 "Paketai"
-#: 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 "Peržiūra"
-#: 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 "Sprendimai"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Įdiegtas"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Šalinti"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "iš^naikinti"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Palikti"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Sulaikyti"
-
-#: 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 "Nebenaudoti paketų sąrašo filtro"
-#: 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 "Pritaikyti filtrą paketų sąrašui"
-#: 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 "Ištrinti"
+
+#: 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 "Paieška"
-#: 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 "įdiegti iš naujo"
-#: 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 "Kld "
-#: 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 "Paketo %s priklausomybės."
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr " Pakeitimų ^sąrašas"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Ne"
-#: 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 "Žymės"
-#: 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 "Būsena"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Nežinomas veiksmo tipas: %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 "
@@ -3453,148 +3337,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 "Nežinomas veiksmo tipas: %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 "Keisti ^Atmestas"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Nustatymai"
-#: 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 "Būsena"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Peržiūrėti sprendimą"
-#: 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 "Pasirinkite sekantį priklausomybių problemų sprendimą."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Peržiūrėti sprendimą"
+#: 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 "Atlikti veiksmus, kurie numatyti pažymėtame sprendime."
-#: 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 "atnaujinti"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Kilęs iš paketo: "
-#: 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 "Rankinis"
-#: 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 "atnaujinti"
-#: 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 "taip"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3647,21 +3514,21 @@ msgstr "Gaunu pakeitimų sąrašą"
msgid "Downloading changelogs"
msgstr "Gaunu pakeitimų sąrašą"
-#: 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 adresas, iš kur paimami pakeitimų žurnalai"
-#: 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"
@@ -3671,19 +3538,19 @@ msgstr[0] "%d atnaujinamas"
msgstr[1] "%d atnaujinami"
msgstr[2] "%d atnaujinamų"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Neįdiegtas"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Nepavyko surasti paketą %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 "
@@ -3695,7 +3562,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'>"
@@ -3707,49 +3574,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 "Vidinė klaida: nesuprantama stulpelio eilutė"
-#: 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 "Priklausomybių tvarkymas"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Priklausomybių tvarkymas"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Priklausomybių tvarkymas"
-#: 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."
@@ -4010,6 +3877,10 @@ msgstr "Įdiegti iš naujo"
msgid "Downgrade"
msgstr "Sendinti"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Šalinti"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4209,6 +4080,20 @@ msgstr "neįdiegtas"
msgid "Install/Upgrade"
msgstr "Įdiegtas"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "iš^naikinti"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Palikti"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Sulaikyti"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4274,133 +4159,133 @@ msgstr "ne"
msgid "Unknown"
msgstr "nežinomas"
-#: 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 "Nei vienas paketas neatitiko derinio „%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 "Paketas: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s versijos"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Diegti(%s pateikia %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 versija: %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 "Palikti šių paketu dabartinesversijas:"
-#: 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 "Atšaukti ^visus veiksmus"
-#: 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 "Atšaukti %F pašalinimą"
-#: 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 "Atšaukti %F pašalinimą"
-#: 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 "Atšaukti %F pašalinimą"
-#: 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 "Nutraukti %F diegimą"
-#: 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 "Atšaukti %F pašalinimą"
-#: 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 "Nutraukti %F diegimą"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Šalinti(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "iš^naikinti"
-#: 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' kad pažymėti kaip automatiška įdiegtus"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
#| msgid "'&m' to mark packages as manually installed"
msgid "Mark %s as manually installed."
msgstr "'&m' kad pažymėti kaip įdiegti rankiniu būdų"
-#: 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“ yra virtualus paketas pateiktas:\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: "
@@ -4430,28 +4315,28 @@ msgstr "%s; bus įdiegtas automatiškai"
msgid "%s is being installed manually."
msgstr "%s; bus įdiegtas automatiškai"
-#: 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 "Paieška"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Kuriu vaizdą"
-#: 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 "Kuriu vaizdą"
-#: 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 "
@@ -4465,7 +4350,7 @@ msgstr ""
" .\n"
" Tai rodo, kad kažkas sugadinta arba Jūsų sistemoje, arba Debian archyvuose."
-#: 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 "
@@ -4476,7 +4361,7 @@ msgstr ""
" Šie paketai bus pašalinti, nes buvo automatiškai įdiegti. Jų reikėjo "
"kitiems paketams. Atlikus planuojamus veiksmus, jie nebebus reikalingi.\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 "
@@ -4486,7 +4371,7 @@ msgstr ""
" Šie paketai gali būti atnaujinti, tačiau paliekami esamoje būklėje tam, kad "
"nesugadinti priklausomybių."
-#: 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 "
@@ -4496,7 +4381,7 @@ msgstr ""
" Šie paketai įdiegiami todėl, kad jie reikalingi paketams, kuriuos Jūs "
"norite įdiegti."
-#: 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 "
@@ -4506,7 +4391,7 @@ msgstr ""
" Šie paketai buvo pašalinti, nes nebėra vieno ar kelių jiems reikalingų "
"paketų, arba kiti paketai konfliktuoja su jais."
-#: 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 "
@@ -4515,7 +4400,7 @@ msgstr ""
"Paketai, kurie bus pasendinti\n"
" Bus įdiegtos senesnės šių paketų versijos."
-#: 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 "
@@ -4525,7 +4410,7 @@ msgstr ""
" Šie paketai gali būti atnaujinti, tačiau Jūs nurodėte, kad šie paketai turi "
"pasilikti dabartinėse versijose."
-#: 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."
@@ -4533,7 +4418,7 @@ msgstr ""
"Paketai, kurie bus įdiegti iš naujo\n"
" Šie paketai bus įdiegti iš naujo."
-#: 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 "
@@ -4542,7 +4427,7 @@ msgstr ""
"Šie paketai bus įdiegti\n"
" Šie paketai bus įdiegti į kompiuterį. Tai atlikti nurodyta rankiniu būdu."
-#: 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."
@@ -4550,7 +4435,7 @@ msgstr ""
"Šie paketai bus pašalinti\n"
" Rankiniu būdu nurodyta, kad šiuos paketus reikia pašalinti."
-#: 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."
@@ -4558,7 +4443,7 @@ msgstr ""
"Atnaujinami paketai\n"
" Bus įdiegtos naujesnės šių paketų versijos."
-#: 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 "
@@ -4568,7 +4453,7 @@ msgstr ""
" Šie paketai yra ne pilnai įdiegti ar nesukonfigūruoti; bus bandoma pabaigti "
"jų diegimą."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4589,119 +4474,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 "Paketas"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Neįdiegtas"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Šalinamas %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 "Nutraukti %F diegimą"
-#: 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 "Atšaukti %F pašalinimą"
-#: 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 "Palikti %F versiją %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 "Diegti(%s pateikia %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 versija: %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 versijos"
-#: 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."
@@ -4712,7 +4603,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 ""
@@ -4721,192 +4612,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 priklauso nuo %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 prieš-priklauso nuo %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 siūlo %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 rekomenduoja %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 konfliktuoja su %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 sugadina %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 pakeičia %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 nurašo %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 "Pašalinti šiuos paketus:"
-#: 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 "Įdiegti šiuos paketus:"
-#: 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 "Pašalinti šiuos paketus:"
-#: 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 "Atnaujinti šiuos paketus:"
-#: 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 "Pasendinti šiuos paketus:"
-#: 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 "Palikti šias priklausomybes neišspręstas:%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 "Pašalint %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 "Įdiegti %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 "Nutraukti %F diegimą"
-#: 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 "Atšaukti %F pašalinimą"
-#: 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 "Palikti %F versiją %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 "Atnaujini %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 "Pasendinti %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 "Šalinti(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Šalinti(%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 "Palikti %F versiją %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 "Palikti %F versiją %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 "Nutraukti %F diegimą"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Nutraukti %F diegimą"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Įdiegti %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 "Įdiegti %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 versija: %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 versija: %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 versijos"
-#: 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 versijos"
-#: 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"
@@ -4916,7 +4819,7 @@ msgstr[0] "%d diegiamas"
msgstr[1] "%d diegiami"
msgstr[2] "%d diegiamų"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4926,7 +4829,7 @@ msgstr[0] "%d šalinamas"
msgstr[1] "%d šalinami"
msgstr[2] "%d šalinamų"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4936,7 +4839,7 @@ msgstr[0] "%d paliekamas"
msgstr[1] "%d paliekami"
msgstr[2] "%d paliekamų"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4946,7 +4849,7 @@ msgstr[0] "%d atnaujinamas"
msgstr[1] "%d atnaujinami"
msgstr[2] "%d atnaujinamų"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4956,7 +4859,7 @@ msgstr[0] "%d pasendintas"
msgstr[1] "%d pasendinti"
msgstr[2] "%d pasendintų"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4965,35 +4868,35 @@ msgstr[0] "Patikrinti ^rekomendacijas"
msgstr[1] "Patikrinti ^rekomendacijas"
msgstr[2] "Patikrinti ^rekomendacijas"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Sprendimų nebėra."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Priklausomybių tvarkymas"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Sprendimų nebėra."
-#: 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 "Sprendimų nebėra."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7804,6 +7707,71 @@ msgstr "Gaunu pakeitimų sąrašą"
msgid "Download Changelog"
msgstr "Gauti pakeitimų sąrašą"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Diegti/šalinti paketus"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Atnaujinti paketų sąrašą"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Pažymėti kaip ^atnaujinamą"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Pamiršti naujus paketus"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Atšaukti ^visus veiksmus"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Valyti paketų krepšį"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "^Išvalyti pasenusius paketus"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Perdaryti paketų krepšį"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Žaisti ^Minų lauką"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Tapti root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Baigti"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "Ištrinti"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Priklausomybių tvarkymas"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(dėl %s)"
diff --git a/po/mr.po b/po/mr.po
index c5139360..ff29b9e9 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-08-22 10:20+0200\n"
"Last-Translator: Priti Patil <prithisd@gmail.com>\n"
"Language-Team: <janabhaaratii@cdacmumbai.in>\n"
@@ -532,8 +532,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 "अंतर्गत चूकः अनपेक्षित व्यर्थ उत्तर."
@@ -1566,7 +1566,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "अवलंबितं रिझाॅल्व करत आहे"
@@ -1668,7 +1668,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 "< व्यर्थ >"
@@ -1804,8 +1804,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 "आवृत्ती"
@@ -1884,12 +1884,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 "वर्णन"
@@ -2042,8 +2042,7 @@ msgstr ""
msgid "Candidate"
msgstr "CandVer"
-#: 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 "संस्थापित करा"
@@ -2183,7 +2182,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 "टॅग्ज (खुणेच्या पट्ट्या)"
@@ -2458,54 +2457,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 "
@@ -2951,356 +2950,242 @@ msgstr ""
msgid "_File"
msgstr "बंद करा"
-#: 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"
msgstr ""
"मूळापर्यंत पोहोचण्यासाठी 'सू' चालवा. यामुळे तुमची रचना जतन राहून आज्ञावली पुन्हा सुरु होईल."
-#: 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 "गाळून टाका"
-
-#: 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 "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 "गाळून टाका"
-
-#: 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 "^स्वच्छ करा"
-
-#: 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 "गाळून टाका"
+
+#: 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 "पुनर्संस्थापित करा"
-#: 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 "Err"
-#: 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 "चेंजलाॅग"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
msgid "Files"
msgstr "बंद करा"
-#: 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 "
@@ -3309,149 +3194,130 @@ 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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-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 "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 ""
@@ -3504,39 +3370,39 @@ msgstr "चेंजलाॅग डाऊनलोड होत आहे."
msgid "Downloading changelogs"
msgstr "चेंजलाॅग डाऊनलोड होत आहे."
-#: 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 available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%d दर्जा वाढवा किंवा %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 "
@@ -3546,7 +3412,7 @@ msgid_plural ""
"size='large'>%d</span>."
msgstr[0] ""
-#: 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'>"
@@ -3556,46 +3422,46 @@ msgid_plural ""
"%d</span> upgrades."
msgstr[0] ""
-#: 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 "Find dependency chains: start"
msgstr "डिपेंडन्सी हाताळणे"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
msgid "Find dependency chains: end"
msgstr "डिपेंडन्सी हाताळणे"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
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 "No dependency chain found."
msgstr "डिपेंडन्सी हाताळणे"
@@ -3854,6 +3720,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 ""
@@ -4045,6 +3915,20 @@ msgstr "संस्थापित केले नाही"
msgid "Install/Upgrade"
msgstr "संस्थापित केले"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^स्वच्छ करा"
+
+#: 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 ""
@@ -4105,119 +3989,119 @@ 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 version %s"
msgstr "%s %s(%s)संस्थापित करत आहे."
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "libsigc++आवृत्ती : %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"
msgstr "काढून टाका"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^स्वच्छ करा"
-#: 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 "Mark %s as manually installed."
msgstr " '&M'हाताने (माणसाकडून) संस्थापित अशी खूण पॅकेजेस करण्यासाठी"
-#: 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"
@@ -4225,11 +4109,11 @@ msgstr ""
"\"%s\" हे आभासी पॅकेज ः\n"
" ने पुरवलेले आहे.\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: "
@@ -4259,28 +4143,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 "
@@ -4294,7 +4178,7 @@ msgstr ""
" ह्या वृक्षाची उपस्थिती बहुतेक हे दर्शवते की काहीतरी तुटले असावे, एकतर तुमच्या प्रणालीवर "
"तरी किंवा डेबियन फाइलसंचात तरी."
-#: 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 "
@@ -4306,7 +4190,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 "
@@ -4316,7 +4200,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 "
@@ -4327,7 +4211,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 "
@@ -4337,7 +4221,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 "
@@ -4346,7 +4230,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 "
@@ -4356,7 +4240,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."
@@ -4364,7 +4248,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 "
@@ -4373,7 +4257,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."
@@ -4381,7 +4265,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."
@@ -4389,7 +4273,7 @@ msgstr ""
"सुधारित आवृत्ती काढण्याची पॅकेजेस\n"
"ह्या पॅकेजेसची नवीन आवृत्ती काढून त्यांचा दर्जा वाढवण्यात येईल. "
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4401,7 +4285,7 @@ msgstr ""
"ही पॅकेजेस संस्थापित करण्यात येतात कारण तुम्ही संस्थापन करण्यासाठी निवडलेल्या दुसऱ्या पॅकेजला "
"त्यांची गरज आहे."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4422,113 +4306,119 @@ 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 "Installing %s version %s is rejected."
msgstr "%s %s(%s)संस्थापित करत आहे."
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "libsigc++आवृत्ती : %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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4537,192 +4427,204 @@ msgid_plural ""
"solutions."
msgstr[0] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
"Always prefer these actions over alternatives that have not been accepted."
msgstr[0] ""
-#: 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
#, fuzzy, 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 %s [<big>%s</big> (%s)]"
msgstr " %F[%s (%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 "<b>Remove</b> %s"
msgstr "काढून टाका"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "काढून टाका"
-#: 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 "<b>Install</b> %s %s"
msgstr " %F[%s (%s (%s)] संस्थापित करा"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
msgid "<b>install</b> %s %s"
msgstr " %F[%s (%s (%s)] संस्थापित करा"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "libsigc++आवृत्ती : %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "libsigc++आवृत्ती : %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"
@@ -4730,7 +4632,7 @@ msgid "%s install"
msgid_plural "%s installs"
msgstr[0] "%d संस्थपित करा"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4738,7 +4640,7 @@ msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "%d काढून टाकणे"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4746,53 +4648,53 @@ msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "%d ठेवा"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "%d दर्जा वाढवा किंवा %d वाढीव दर्जाची गोष्ट"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "%d दर्जा कमी करा किंवा %d कमी दर्जाची गोष्ट"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "आॅडिट ^शिफारसी"
-#: 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 "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 ""
@@ -7572,6 +7474,75 @@ msgid "Download Changelog"
msgstr "डाऊनलोड चेंजलाॅग"
#, 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 "गाळून टाका"
+
+#, fuzzy
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "डिपेंडन्सी हाताळणे"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "उत्तरातील बदलांचा स्पष्टीकरण दाखवा"
+
+#, fuzzy
#~ msgid "Dependency Chain"
#~ msgstr "डिपेंडन्सी हाताळणे"
diff --git a/po/nb.po b/po/nb.po
index 2e582c20..9c02f150 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_nb\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-09-01 15:03+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -645,8 +645,8 @@ msgstr "Kritisk feil i oppløser"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Løser opp avhengigheter"
-#: 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 "Intern feil: uventet null-løsning."
@@ -1711,7 +1711,7 @@ msgstr ""
"Jeg ønsker å løse avhengighetene, men ingen avhengighetsløser ble opprettet."
#: 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 "Løser opp avhengigheter ..."
@@ -1816,7 +1816,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Disse pakkene hadde utilfredsstilte avhengigheter:\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>"
@@ -1952,8 +1952,8 @@ msgstr "Automatisk installert"
msgid "no"
msgstr "ingen"
-#: 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 "Versjon: "
@@ -2032,12 +2032,12 @@ msgid "Obsoletes"
msgstr "Foreldet"
#: 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 "Skaffer"
#: 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 "Beskrivelse: "
@@ -2190,8 +2190,7 @@ msgstr "Nåværende"
msgid "Candidate"
msgstr "Kandidat"
-#: 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 "Installer"
@@ -2333,7 +2332,7 @@ msgstr "IKKE OPPFYLT"
msgid "UNAVAILABLE"
msgstr "UTILGJENGELIG"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Merker"
@@ -2601,54 +2600,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 "Bolk"
-#: 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 "Kans^eller utestående handlinger"
-#: 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 "'-' for å slette pakker"
-#: 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 "ikke en virkelig pakke"
-#: 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 "Fjern disse pakkene:"
-#: 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 "
@@ -3109,99 +3108,45 @@ msgstr ""
msgid "_File"
msgstr "Usann"
-#: 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 "Utfør alle utestående installeringer og slettinger"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^installer/slett pakker"
-
-#: 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 "Se etter nye versjoner av pakkene"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Oppdater pakkelista"
-
-#: 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 "Marker alle oppgraderbare pakker som ikke holdes tilbake"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Marker opp^graderbare"
-
-#: 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 "Glem hvilke pakker som er «nye»"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Glem nye pakker"
-
-#: 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 ""
"Kanseller alle utestående installeringer, slettinger holdinger og "
"oppgraderinger."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Kans^eller utestående handlinger"
-
-#: 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 "Slett alle pakkefiler som ble lastet ned tidligere"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Slett mellomlageret for pakker"
-
-#: 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 "Slett pakkefiler som ikke lenger kan lastes ned"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Fjern ^foreldede filer"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Last mellomlageret for pakker på nytt"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Last pakkelageret på nytt"
-
-#: 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 "Kast bort tid på å finne miner"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Spill minesveiper"
-
-#: 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"
@@ -3209,261 +3154,200 @@ msgstr ""
"Kjør «su» for å bli root. Dette vil starte programmet på nytt, men "
"innstillingene blir bevart"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Bli root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Avslutt programmet"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Avslutt"
-
-#: 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 "Angre den siste pakkeoperasjonen eller en gruppe operasjoner"
-#: 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 "slett"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pakke"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Visninger"
-#: 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 "Håndtering av avhengigheter"
-
-#: 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 "slett"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Hjelp"
-#: 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 "Listeoppdatering"
-#: 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 "Pakker"
-#: 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 "Forhåndsvisning"
-#: 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 "Løsningsfinner"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "installertI"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Fjern"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Slett helt"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Behold"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Hold"
-
-#: 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 "Fjern filtrering av pakkelista"
-#: 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 "Bruk et filter på pakkelista"
-#: 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 "slett"
+
+#: 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 "Søk"
-#: 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 "installer på nytt"
-#: 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 "Feil "
-#: 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 "Avhengigheter av %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Endringslogg"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Usann"
-#: 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 "Merker"
-#: 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 "Tilstand"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Ukjent handlingstype: %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 "
@@ -3472,150 +3356,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 "Ukjent handlingstype: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "vis en forklaring på løsningsendringene"
-
-#: 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 "Slå av/på ^Avvist"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Innstillinger"
-#: 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 "Tilstand"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Undersøk løsning"
-#: 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 "Velg den neste løsningen på avhengighetsproblemene."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Undersøk løsning"
+#: 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 "Utfør de handlingene som er inneholdt i den løsningen som nå er valgt."
-#: 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 "Oppgrader"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Kildepakke: "
-#: 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 "Håndbok"
-#: 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 "Oppgrader"
-#: 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 "ja"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3668,21 +3533,21 @@ msgstr "Laster ned endringslogg"
msgid "Downloading changelogs"
msgstr "Laster ned endringslogg"
-#: 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 "Nettadresse som changelogs skal hentes fra"
-#: 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"
@@ -3691,19 +3556,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d oppgradert"
msgstr[1] "%d oppgraderte"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Ikke installert"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Klarte ikke å finne pakka %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 "
@@ -3714,7 +3579,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3725,49 +3590,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Intern feil: Standard kolonnestreng er uleselig"
-#: 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 "Håndtering av avhengigheter"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Håndtering av avhengigheter"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Håndtering av avhengigheter"
-#: 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."
@@ -4032,6 +3897,10 @@ msgstr "Installer på nytt"
msgid "Downgrade"
msgstr "Nedgrader"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Fjern"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4228,6 +4097,20 @@ msgstr "ikke installert"
msgid "Install/Upgrade"
msgstr "installertI"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Slett helt"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Behold"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Hold"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4293,133 +4176,133 @@ msgstr "ingen"
msgid "Unknown"
msgstr "Ukjent"
-#: 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 "Ingen pakker passet med mønsteret «%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 "Pakke: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s-versjoner"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Installerer(%s skaffer %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-versjon: %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 "Behold disse pakkene i nåværende versjon:"
-#: 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 "Kans^eller utestående handlinger"
-#: 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 "Avbryt fjerning av %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 "Avbryt fjerning av %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 "Avbryt fjerning av %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 "Avbryt installasjonen av %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 "Avbryt fjerning av %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 "Avbryt installasjonen av %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Fjern(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Slett helt"
-#: 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' for å merke pakker som automatisk installert"
-#: 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 "Pakken «%s» ble manuelt installert.\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» er en virtuell pakke som behøves av:\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: "
@@ -4449,28 +4332,28 @@ msgstr "%s, vil bli installert automatisk"
msgid "%s is being installed manually."
msgstr "%s, vil bli installert automatisk"
-#: 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 "Søk"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Bygger visning"
-#: 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 "Bygger visning"
-#: 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 "
@@ -4486,7 +4369,7 @@ msgstr ""
"Det at denne bolken er tilstede kan tyde på at noe er ødelagt, enten på ditt "
"system eller i Debian-arkivet."
-#: 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 "
@@ -4498,7 +4381,7 @@ msgstr ""
"tilfredsstille en eller annen «viktig» avhengighet til en eller flere pakker "
"du nå er i ferd med å slette.\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 "
@@ -4508,7 +4391,7 @@ msgstr ""
" Disse pakkene kunne ha blitt oppgradert, men de beholdes slik de er for å "
"forhindre brutte avhengigheter."
-#: 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 "
@@ -4518,7 +4401,7 @@ msgstr ""
" Disse pakkene blir installert fordi de behøves av en annen pakke som du har "
"valgt å installere."
-#: 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 "
@@ -4528,7 +4411,7 @@ msgstr ""
" Disse pakkene blir slettet fordi en eller flere av deres avhengigheter ikke "
"lenger er tilgjengelig, eller fordi de er i konflikt med en annen pakke."
-#: 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 "
@@ -4538,7 +4421,7 @@ msgstr ""
" En eldre versjon av disse pakkene vil bli installert istedenfor den "
"nåværende."
-#: 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 "
@@ -4548,7 +4431,7 @@ msgstr ""
" Disse pakkene kunne ha blitt oppgradert, men du har bedt om at de beholdes "
"i sin nåværende utgave."
-#: 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."
@@ -4556,7 +4439,7 @@ msgstr ""
"Pakker som skal reinstalleres\n"
" Disse pakkene vil bli reinstallert."
-#: 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 "
@@ -4565,7 +4448,7 @@ msgstr ""
"Pakker som skal installeres\n"
" Disse pakkene har du selv valgt at skal installeres på din maskin."
-#: 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."
@@ -4573,7 +4456,7 @@ msgstr ""
"Pakker som skal fjernes\n"
" Disse pakkene har du selv valgt at skal fjernes fra din maskin."
-#: 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."
@@ -4581,7 +4464,7 @@ msgstr ""
"Pakker som skal oppgraderes\n"
" Disse pakkene vil bli oppgradert til en nyere versjon."
-#: 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 "
@@ -4591,7 +4474,7 @@ msgstr ""
" Disse pakkene er ikke fullstendig installert og satt opp; et forsøk vil bli "
"gjort for å fullføre installasjonen."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4612,117 +4495,123 @@ 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 "Pakke"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Ikke installert"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Fjerner  %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 "Avbryt installasjonen av %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 "Avbryt fjerning av %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 "Behold %F i versjon %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 "Installerer(%s skaffer %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-versjon: %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-versjoner"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4732,7 +4621,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4740,192 +4629,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 avhenger av %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 krever %s på forhånd"
-#: 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 foreslår %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 anbefaler %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 er i konflikt med %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 ødelegger %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 erstatter %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 gjør %s foreldet"
-#: 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 "Fjern disse pakkene:"
-#: 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 "Installer disse pakkene:"
-#: 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 "Fjern disse pakkene:"
-#: 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 "Oppgrader disse pakkene:"
-#: 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 "Nedgrader disse pakkene:"
-#: 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 "La følgende avhengigheter være uløste:%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 "Fjern %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 "Installer %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 "Avbryt installasjonen av %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 "Avbryt fjerning av %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 "Behold %F i versjon %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 "Oppgrader %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 "Nedgrader %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 "Fjern(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Fjern(%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 "Behold %F i versjon %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 "Behold %F i versjon %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 "Avbryt installasjonen av %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Avbryt installasjonen av %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Installer %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 "Installer %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-versjon: %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-versjon: %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-versjoner"
-#: 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-versjoner"
-#: 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"
@@ -4934,7 +4835,7 @@ msgid_plural "%s installs"
msgstr[0] "%d installert"
msgstr[1] "%d installert"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4943,7 +4844,7 @@ msgid_plural "%s removes"
msgstr[0] "%d fjernet"
msgstr[1] "%d fjernet"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4952,7 +4853,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d beholdt"
msgstr[1] "%d beholdt"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4961,7 +4862,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d oppgradert"
msgstr[1] "%d oppgraderte"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4970,7 +4871,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d nedgradert"
msgstr[1] "%d nedgraderte"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4978,35 +4879,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Revider ^Anbefalinger"
msgstr[1] "Revider ^Anbefalinger"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Ingen flere løsninger."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Håndtering av avhengigheter"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Ingen flere løsninger."
-#: 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 "Ingen flere løsninger."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7814,6 +7715,76 @@ msgstr "Laster ned endringslogg"
msgid "Download Changelog"
msgstr "Last ned endringslogg"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^installer/slett pakker"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Oppdater pakkelista"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Marker opp^graderbare"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Glem nye pakker"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Kans^eller utestående handlinger"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Slett mellomlageret for pakker"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Fjern ^foreldede filer"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Last pakkelageret på nytt"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Spill minesveiper"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Bli root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Avslutt"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "slett"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Håndtering av avhengigheter"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "vis en forklaring på løsningsendringene"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(for %s)"
diff --git a/po/ne.po b/po/ne.po
index 9d1cd0c8..32da08e9 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_po_ne\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: 2007-08-05 17:09+0545\n"
"Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -536,8 +536,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 "आन्तरिक त्रुटि: अनपेक्षित शून्य समाधान ।"
@@ -1599,7 +1599,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "निर्भरताहरू पुन समाधान गर्दैछ..."
@@ -1702,7 +1702,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>"
@@ -1838,8 +1838,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 "संस्करण:"
@@ -1918,12 +1918,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 "वर्णन:"
@@ -2084,8 +2084,7 @@ msgstr ""
msgid "Candidate"
msgstr "CandVer"
-#: 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 "स्थापना गर्नुहोस्"
@@ -2228,7 +2227,7 @@ msgstr "UNSATISFIED"
msgid "UNAVAILABLE"
msgstr "UNAVAILABLE"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "ट्यागहरू"
@@ -2503,54 +2502,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 "
@@ -2997,98 +2996,44 @@ msgstr ""
msgid "_File"
msgstr "बन्द गर्नुहोस्"
-#: 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 "Up^gradable लाई चिनो लगाउनुहोस्"
-
-#: 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 "विर्सनुहोस जुन प्याकेजहरू \"new\" छन् "
-#: 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"
@@ -3096,260 +3041,199 @@ 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 "मेट्नुहोस्"
-
-#: 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 "मेट्नुहोस्"
-
-#: 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 "^सफा गर्नुहोस्"
-
-#: 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 "मेट्नुहोस्"
+
+#: 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 "पुन:स्थापना गर्नुहोस्"
-#: 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 "Err "
-#: 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 "^परिवर्तनलग"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
msgid "Files"
msgstr "बन्द गर्नुहोस्"
-#: 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 "
@@ -3358,147 +3242,130 @@ 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 "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 ""
@@ -3551,21 +3418,21 @@ msgstr "परिवर्तनलग डाउनलोड गर्दै"
msgid "Downloading changelogs"
msgstr "परिवर्तनलग डाउनलोड गर्दै"
-#: 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"
@@ -3574,19 +3441,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d स्तरवृद्धि गर्नुहोस्"
msgstr[1] "%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 "
@@ -3597,7 +3464,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3608,49 +3475,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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."
@@ -3910,6 +3777,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 ""
@@ -4106,6 +3977,20 @@ msgstr "स्थापना भएन"
msgid "Install/Upgrade"
msgstr "स्थापना भयो"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^सफा गर्नुहोस्"
+
+#: 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 ""
@@ -4167,130 +4052,130 @@ 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 version %s"
msgstr " %s %s (%s) स्थापना हुदै"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
#| msgid "libsigc++ version: %s\n"
msgid "Downgrade to %s version %s"
msgstr "libsigc++ version: %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"
msgstr "हटाउनुहोस्"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^सफा गर्नुहोस्"
-#: 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 "Mark %s as manually installed."
msgstr "'&M' प्याकेजहरू म्यानुल्ली स्थापना भएकोमा चिनो गर्न"
-#: 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: "
@@ -4320,28 +4205,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 "
@@ -4355,7 +4240,7 @@ msgstr ""
"\n"
"यो ट्रीको व्यवहारले, या तपाईँको प्रणालीमा वा डेवियन संग्रहमा केही भाँचिएको इंकित गर्दछ ।"
-#: 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 "
@@ -4367,7 +4252,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 "
@@ -4377,7 +4262,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 "
@@ -4387,7 +4272,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 "
@@ -4397,7 +4282,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 "
@@ -4406,7 +4291,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 "
@@ -4416,7 +4301,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."
@@ -4424,7 +4309,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 "
@@ -4433,7 +4318,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."
@@ -4441,7 +4326,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."
@@ -4449,7 +4334,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 "
@@ -4459,7 +4344,7 @@ msgstr ""
"यी प्याकेज पूर्ण रुपमा स्थापना र कन्फिगर गरिएका छैनन्; एक प्रयासद्वारा तिनको स्थापना पूर्ण "
"हुनेछ ।"
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4480,116 +4365,122 @@ 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 at version %s (%s)"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
msgid "Installing %s version %s is rejected."
msgstr " %s %s (%s) स्थापना हुदै"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
#| msgid "libsigc++ version: %s\n"
msgid "Downgrading %s to version %s is rejected."
msgstr "libsigc++ version: %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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4599,7 +4490,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4607,191 +4498,203 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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
#, fuzzy, c-format
#| msgid "%s replaces %s"
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 at version %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 "<b>Remove</b> %s"
msgstr "हटाउनुहोस्"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "हटाउनुहोस्"
-#: 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 at version %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 at version %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 "libsigc++ version: %s\n"
msgid "<b>Downgrade</b> %s to version %s"
msgstr "libsigc++ version: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
#| msgid "libsigc++ version: %s\n"
msgid "<b>downgrade</b> %s to version %s"
msgstr "libsigc++ version: %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"
@@ -4800,7 +4703,7 @@ msgid_plural "%s installs"
msgstr[0] "%d स्थापना गर्नुहोस्"
msgstr[1] "%d स्थापना गर्छ"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4809,7 +4712,7 @@ msgid_plural "%s removes"
msgstr[0] "%d हटाइएको"
msgstr[1] "%d हटाउने कामहरू"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4818,7 +4721,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d राख्नुहोस्"
msgstr[1] "%d राख्छ"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4827,7 +4730,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d स्तरवृद्धि गर्नुहोस्"
msgstr[1] "%d स्तरवृद्धि गर्छ"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4836,7 +4739,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d स्तरकम गर्नुहोस्"
msgstr[1] "%d स्तरकम गर्छ"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4844,35 +4747,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "सिफारिशहरू लेखा जाँच्नुहोस्"
msgstr[1] "सिफारिशहरू लेखा जाँच्नुहोस्"
-#: 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 ""
@@ -7680,6 +7583,71 @@ msgid "Download Changelog"
msgstr "परिवर्तनलग डाउनलोड गर्नुहोस्"
#, 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 "Up^gradable लाई चिनो लगाउनुहोस्"
+
+#, 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 "मेट्नुहोस्"
+
+#, fuzzy
+#~| msgid "^Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "^निर्भरता ह्यान्डलिङ्"
+
+#, fuzzy
#~| msgid "^Dependency handling"
#~ msgid "Dependency Chain"
#~ msgstr "^निर्भरता ह्यान्डलिङ्"
diff --git a/po/nl.po b/po/nl.po
index 509daea8..a826ab5e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-09-05 23:04+0200\n"
"Last-Translator: Frans Pop <elendil@planet.nl>\n"
"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -561,8 +561,8 @@ msgstr "Fatale fout in de oplosser"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Bezig met het oplossen van afhankelijkheden"
-#: 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 "Interne fout: onverwachte null-oplossing."
@@ -1649,7 +1649,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "Bezig met het oplossen van afhankelijkheden..."
@@ -1756,7 +1756,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "De volgende pakketten hebben niet-voldane afhankelijkheden:\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>"
@@ -1892,8 +1892,8 @@ msgstr "Automatisch geïnstalleerd"
msgid "no"
msgstr "nee"
-#: 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 "Versie: "
@@ -1972,12 +1972,12 @@ msgid "Obsoletes"
msgstr "Veroudert"
#: 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 "Voorziet in"
#: 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 "Beschrijving: "
@@ -2132,8 +2132,7 @@ msgstr "Huidig"
msgid "Candidate"
msgstr "Kandidaat"
-#: 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 "Installeren"
@@ -2273,7 +2272,7 @@ msgstr "NIET VOLDAAN"
msgid "UNAVAILABLE"
msgstr "NIET AANWEZIG"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Labels"
@@ -2550,54 +2549,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 "Sectie"
-#: 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 "Annuleer ^lopende acties"
-#: 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 "'-' om pakketten te verwijderen"
-#: 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 "geen werkelijk pakket"
-#: 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 "Verwijder de volgende pakketten:"
-#: 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 "
@@ -3060,101 +3059,47 @@ msgstr ""
msgid "_File"
msgstr "Onwaar"
-#: 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 "Doe alle uitstaande installaties en verwijderingen"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Installeer/verwijder pakketten"
-
-#: 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 "Controleer op nieuwe versies van pakketten"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Werk pakketlijst bij"
-
-#: 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 ""
"Markeer alle opwaardeerbare pakketten die niet vastgehouden zijn voor "
"opwaardering"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Markeer ^opwaardeerbaar"
-
-#: 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 "Vergeet welke pakketten \"nieuw\" zijn"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "Vergeet ^nieuwe pakketten"
-
-#: 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 ""
"Annuleer al het installeren, verwijderen, behouden en opwaarderen van "
"pakketten"
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Annuleer ^lopende acties"
-
-#: 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 "Verwijder pakketbestanden die vroeger opgehaald zijn"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Schoon ^pakketcache"
-
-#: 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 "Verwijder pakketbestanden die niet langer kunnen opgehaald worden"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "^Schoon veroudere bestanden"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Herlaad de pakketcache"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Herlaad pakketcache"
-
-#: 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 "Tijd verliezen bij het proberen vinden van mijnen"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Speel ^Mijnenveger"
-
-#: 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"
@@ -3162,261 +3107,200 @@ msgstr ""
"Voer 'su' uit om root te worden; dit zal het programma herstarten, maar uw "
"instellingen zullen bewaard blijven"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Word root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Sluit het programma af"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Afsluiten"
-
-#: 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 "Maak de laatste pakketoperatie of groep van operaties ongedaan"
-#: 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 "verwijderen"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pakket"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Views"
-#: 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 "Afhankelijkheidsafhandeling"
-
-#: 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 "verwijderen"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Help"
-#: 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 "Lijst Bijwerken"
-#: 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 "Pakketten"
-#: 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 "Vooruitblik"
-#: 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 "Oplosser"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Geïnstalleerd"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Wis (purge)"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Behouden"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Bevriezen"
-
-#: 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 "Verwijder de filter van de pakketlijst"
-#: 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 "Pas een filter toe op de pakketlijst"
-#: 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 "verwijderen"
+
+#: 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 "Zoek"
-#: 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 "herinstalleren"
-#: 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 "Fout "
-#: 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 "Afhankelijkheden van %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 "Onwaar"
-#: 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 "Labels"
-#: 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 "Staat"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Onbekend actietype: %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 "
@@ -3425,148 +3309,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 "Onbekend actietype: %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 "Schakel Ver^worpen"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Voorkeursinstellingen"
-#: 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 "Staat"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Bestudeer Oplossing"
-#: 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 "Selecteer de volgende oplossing voor de afhankelijkheidsproblemen"
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Bestudeer Oplossing"
+#: 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 "Voer de acties behorend bij de momenteel geselecteerde oplossing uit"
-#: 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 "Opwaarderen"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Bronpakket: "
-#: 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 "Handmatig"
-#: 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 "Opwaarderen"
-#: 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 "ja"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3619,21 +3486,21 @@ msgstr "Changelog wordt opgehaald"
msgid "Downloading changelogs"
msgstr "Changelog wordt opgehaald"
-#: 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 "Te gebruiken URL voor het ophalen van changelogs"
-#: 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"
@@ -3642,19 +3509,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d op te waarderen"
msgstr[1] "%d op te waarderen"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Niet-geïnstalleerd"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Kan pakket %s niet localiseren"
-#: 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 "
@@ -3665,7 +3532,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3676,49 +3543,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Interne fout: standaard kolomstring is niet ontleedbaar"
-#: 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 "Afhankelijkheidsafhandeling"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Afhankelijkheidsafhandeling"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Afhankelijkheidsafhandeling"
-#: 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."
@@ -3979,6 +3846,10 @@ msgstr "Herinstalleren"
msgid "Downgrade"
msgstr "Degraderen"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Verwijderen"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4177,6 +4048,20 @@ msgstr "niet geïnstalleerd"
msgid "Install/Upgrade"
msgstr "Geïnstalleerd"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Wis (purge)"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Behouden"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Bevriezen"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4242,133 +4127,133 @@ msgstr "nee"
msgid "Unknown"
msgstr "Onbekend"
-#: 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 "Er zijn geen pakketten die overeenkomen met het patroon \"%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 "Pakket: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s versies"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Installeer(%s voorziet in %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-versie: %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 "Behoud de volgende pakketten op hun huidige versie:"
-#: 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 "Annuleer ^lopende acties"
-#: 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 "Annuleer de verwijdering van %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 "Annuleer de verwijdering van %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 "Annuleer de verwijdering van %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 "Breek de installatie van %F af"
-#: 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 "Annuleer de verwijdering van %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 "Breek de installatie van %F af"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Verwijder(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Wis (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' om pakketten als automatisch geïnstalleerd te markeren"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
#| msgid "'&m' to mark packages as manually installed"
msgid "Mark %s as manually installed."
msgstr "'&m' om pakketten als handmatig geïnstalleerd te markeren"
-#: 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\" is een virtueel pakket waarin wordt voorzien door:\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: "
@@ -4398,28 +4283,28 @@ msgstr "%s; zal automatisch worden geïnstalleerd"
msgid "%s is being installed manually."
msgstr "%s; zal automatisch worden geïnstalleerd"
-#: 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 "Zoek"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Beeld opbouwen"
-#: 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 "Beeld opbouwen"
-#: 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 "
@@ -4435,7 +4320,7 @@ msgstr ""
" De aanwezigheid van deze boom geeft waarschijnlijk aan dat iets defect is, "
"ofwel op uw systeem ofwel in het Debian-archief."
-#: 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 "
@@ -4448,7 +4333,7 @@ msgstr ""
"geïnstalleerde pakketten een 'belangrijke' afhankelijkheid meer op ze "
"hebben.\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 "
@@ -4458,7 +4343,7 @@ msgstr ""
" Deze pakketten kunnen opgewaardeerd worden, maar ze zijn achtergehouden in "
"hun huidige staat om het breken van afhankelijkheiden te vermijden."
-#: 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 "
@@ -4469,7 +4354,7 @@ msgstr ""
" Deze pakketen worden geïnstalleerd omdat ze vereist zijn door een ander "
"pakket dat u hebt gekozen om te installeren."
-#: 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 "
@@ -4479,7 +4364,7 @@ msgstr ""
" Deze pakketen worden verwijderd omdat één of meer van hun afhankelijkheden "
"niet langer beschikbaar zijn, of omdat een ander pakket met hen conflicteert."
-#: 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 "
@@ -4489,7 +4374,7 @@ msgstr ""
" Een oudere versie van deze pakketten dan de momenteel geïnstalleerde zal "
"worden geïnstalleerd."
-#: 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 "
@@ -4499,7 +4384,7 @@ msgstr ""
" Deze pakketten kunnen opgewaardeerd worden, maar u hebt gevraagd ze achter "
"te houden op hun huidige versie."
-#: 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."
@@ -4507,7 +4392,7 @@ msgstr ""
"Te herinstalleren pakketten\n"
" Deze pakketten worden geherinstalleerd."
-#: 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 "
@@ -4516,7 +4401,7 @@ msgstr ""
"Te installeren pakketten\n"
" Deze pakketten zijn handmatig geselecteerd voor installatie op uw computer."
-#: 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."
@@ -4524,7 +4409,7 @@ msgstr ""
"Te verwijderen pakketten\n"
" Deze pakketten zijn handmatig geselecteerd voor verwijdering."
-#: 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."
@@ -4532,7 +4417,7 @@ msgstr ""
"Op te waarderen pakketten\n"
" Deze pakketten zullen worden opgewaardeerd naar een nieuwere versie."
-#: 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 "
@@ -4542,7 +4427,7 @@ msgstr ""
" Deze pakketen zijn niet volledig geïnstalleerd en geconfigureerd; gepoogd "
"zal worden hun installatie te voltooien."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4563,117 +4448,123 @@ 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 "Pakket"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Niet-geïnstalleerd"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Verwijderen van %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 "Breek de installatie van %F af"
-#: 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 "Annuleer de verwijdering van %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 "Behoud %F op versie %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 "Installeer(%s voorziet in %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-versie: %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 versies"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4683,7 +4574,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4691,192 +4582,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 hangt af van %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 hangt volledig af van %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 suggereert %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 beveelt aan %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 conflicteert met %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 breekt %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 vervangt %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 veroudert %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 "Verwijder de volgende pakketten:"
-#: 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 "Installeer de volgende pakketten:"
-#: 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 "Verwijder de volgende pakketten:"
-#: 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 "Waardeer volgende pakketten op:"
-#: 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 " Degradeer de volgende pakketten:"
-#: 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 "Laat de volgende afhankelijkheden onopgelost:%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 "Verwijder %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 "Installeer %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 "Breek de installatie van %F af"
-#: 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 "Annuleer de verwijdering van %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 "Behoud %F op versie %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 "Opwaarderen van %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 "Degradeer %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 "Verwijder(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Verwijder(%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 "Behoud %F op versie %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 "Behoud %F op versie %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 "Breek de installatie van %F af"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Breek de installatie van %F af"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Installeer %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 "Installeer %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-versie: %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-versie: %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 versies"
-#: 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 versies"
-#: 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"
@@ -4885,7 +4788,7 @@ msgid_plural "%s installs"
msgstr[0] "%d installatie"
msgstr[1] "%d installaties"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4894,7 +4797,7 @@ msgid_plural "%s removes"
msgstr[0] "%d te verwijderen"
msgstr[1] "%d te verwijderen"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4903,7 +4806,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d behouden"
msgstr[1] "%d behouden"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4912,7 +4815,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d op te waarderen"
msgstr[1] "%d op te waarderen"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4921,7 +4824,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d degradatie"
msgstr[1] "%d degradaties"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4929,35 +4832,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Onderzoek ^Aanbevelingen"
msgstr[1] "Onderzoek ^Aanbevelingen"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Geen oplossingen meer."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Afhankelijkheidsafhandeling"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Geen oplossingen meer."
-#: 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 "Geen oplossingen meer."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7805,6 +7708,71 @@ msgstr "Changelog wordt opgehaald"
msgid "Download Changelog"
msgstr "Changelog Ophalen"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Installeer/verwijder pakketten"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Werk pakketlijst bij"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Markeer ^opwaardeerbaar"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "Vergeet ^nieuwe pakketten"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Annuleer ^lopende acties"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Schoon ^pakketcache"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "^Schoon veroudere bestanden"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Herlaad pakketcache"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Speel ^Mijnenveger"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Word root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Afsluiten"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "verwijderen"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Afhankelijkheidsafhandeling"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(voor %s)"
diff --git a/po/nn.po b/po/nn.po
index 0efa5f97..bbde6b2d 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_nn\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: 2005-06-27 21:26+0200\n"
"Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -533,8 +533,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Klarer ikkje løysa pakkekrav."
-#: 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 "Intern feil: uventa nulløysing."
@@ -1574,7 +1574,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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
#, fuzzy
msgid "Resolving dependencies..."
@@ -1678,7 +1678,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Desse pakkane hadde utilfredsstilte pakkekrav:\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>"
@@ -1812,8 +1812,8 @@ msgstr "Automatisk installert"
msgid "no"
msgstr "ingen"
-#: 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 "Versjon: "
@@ -1892,12 +1892,12 @@ msgid "Obsoletes"
msgstr "Foreldar"
#: 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 "Skaffar"
#: 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 "Skildring: "
@@ -2053,8 +2053,7 @@ msgstr ""
msgid "Candidate"
msgstr "Kdt.Ver"
-#: 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
#, fuzzy
msgid "Install"
msgstr "^Installer"
@@ -2195,7 +2194,7 @@ msgstr "IKKJE TILFREDSSTILT"
msgid "UNAVAILABLE"
msgstr "IKKJE TILGJENGELEG"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
#, fuzzy
msgid "Tags"
msgstr "Merke"
@@ -2463,52 +2462,52 @@ 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 "Seksjon"
-#: src/generic/apt/aptitude_resolver_universe.cc:872
+#: src/generic/apt/aptitude_resolver_universe.cc:879
#, fuzzy
msgid "Cancel all user actions"
msgstr "Pakkar som krev %s"
-#: 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 "- for å fjerne pakkar"
-#: 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 "ikkje ein verkeleg pakke"
-#: 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 essential packages"
msgstr "%BFjern%b desse pakkane: %n"
-#: 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 "
@@ -2960,96 +2959,44 @@ msgstr ""
msgid "_File"
msgstr "Lukk"
-#: 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 "Utfør installering og fjerning av pakkar"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Installer/fjern pakkar"
-
-#: 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 "Sjå etter nye versjonar av pakkar"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Oppdater pakkeliste"
-
-#: 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 "Marker alle pakkar som ikkje er haldt tilbake til oppgradering"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-msgid "Mark Up_gradable"
-msgstr "Marker ^Oppgraderbare"
-
-#: 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 "Gløym kva for pakkar som er «nye»"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Gløym nye pakkar"
-
-#: src/gtk/aptitude.glade:94 src/ui.cc:2237
+#: src/gtk/aptitude.glade:71 src/ui.cc:2237
#, fuzzy
msgid "Cancel all pending installations, removals, holds, and upgrades."
msgstr "Utfør installering og fjerning av pakkar"
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-msgid "Canc_el Pending Actions"
-msgstr "Pakkar som krev %s"
-
-#: 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 "Slett tidlegare nedlasta pakkefiler"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Reinsk pakkemellomlageret"
-
-#: 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 "Slett pakkefiler som ikkje kan hentast lenger"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Slett ^forelda filer"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Lastar pakkelagert inn på ny"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Last inn igjen pakkemellomlageret"
-
-#: 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 "Bruke tida på å finna miner"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Spel minesveipar"
-
-#: 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"
@@ -3057,261 +3004,198 @@ msgstr ""
"Køyrer «su» for å bli root. Dette vil starta programmet på ny, men "
"instillingane vil bli tatt vare på."
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Bli root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Avsluttar programmet"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Avslutt"
-
-#: 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 "Angrar den siste pakkehandlinga eller gruppe av handlingar"
-#: 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 "slett"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pakke"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Visingar"
-#: 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 "Find _Dependency Chains"
-msgstr "^Handsaming av pakkekrav"
-
-#: 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 "slett"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Hjelp"
-#: 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 "Listeoppdatering"
-#: 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 "Pakkar"
-#: 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 "Førehandsvising"
-#: 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
#, fuzzy
msgid "Resolver"
msgstr "^Fjern"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
msgid "Install/Remove"
msgstr "installert"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-#, fuzzy
-msgid "Remove"
-msgstr "^Fjern"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Reinsk ut"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-#, fuzzy
-msgid "Keep"
-msgstr "^Ta vare på"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-#, fuzzy
-msgid "Hold"
-msgstr "^Hald tilbake"
-
-#: 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 "Fjernar filteret frå pakkelista"
-#: 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 "Bruk eit filter på pakkelista"
-#: 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 "slett"
+
+#: 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 "Søk"
-#: 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 "installer på ny"
-#: 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 "Feil "
-#: 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 "Pakkekrav for %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Endringslogg"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
msgid "Files"
msgstr "Lukk"
-#: 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"
msgstr "Merke"
-#: 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 "Tilstand"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Ukjent handlingstype: %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 "
@@ -3320,140 +3204,123 @@ 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 "Ukjent handlingstype: %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
msgid "Rejected"
msgstr ""
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
msgid "No preference"
msgstr "Forkrav"
-#: 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
-#, fuzzy
-#| msgid "State"
-msgid "Status"
-msgstr "Tilstand"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
msgstr ""
-#: src/gtk/aptitude.glade:1442
+#: src/gtk/aptitude.glade:1373
#, fuzzy
msgid "Calculate the next solution that has not yet been generated."
msgstr "Inga løysing på desse pakkekrava finst!"
-#: src/gtk/aptitude.glade:1443
-msgid "Find a new solution"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
msgstr ""
-#: src/gtk/aptitude.glade:1457
+#: src/gtk/aptitude.glade:1388
#, fuzzy
msgid ""
"Perform the actions in the currently selected solution and close this tab."
msgstr "Inga løysing på desse pakkekrava finst!"
-#: src/gtk/aptitude.glade:1458
-msgid "gtk-apply"
-msgstr ""
-
-#: src/gtk/aptitude.glade:1607
+#: src/gtk/aptitude.glade:1543
#, fuzzy
msgid "Upgrade Summary"
msgstr "oppgrader"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Kjeldepakke: "
-#: 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 "Fix Manually"
msgstr "Merk ^Manuell"
-#: 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
#, fuzzy
msgid "Upgrade"
msgstr "oppgrader"
-#: 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 "ja"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3506,39 +3373,39 @@ msgstr "Lastar ned endringslogg"
msgid "Downloading changelogs"
msgstr "Lastar ned endringslogg"
-#: 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 "Nettadresse som endringsloggar skal hentast frå"
-#: 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 available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%d oppgraderingar"
msgstr[1] "%d oppgraderingar"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Ikkje installert"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
msgid "Unable to calculate an upgrade."
msgstr "Klarer ikkje opna %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 "
@@ -3549,7 +3416,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3560,46 +3427,46 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Intern feil: Standard kolonnestreng kan ikkje tolkast"
-#: 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 "Find dependency chains: start"
msgstr "^Handsaming av pakkekrav"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
msgid "Find dependency chains: end"
msgstr "^Handsaming av pakkekrav"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
msgid "Find dependency chains: results"
msgstr "^Handsaming av pakkekrav"
-#: 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 "No dependency chain found."
msgstr "^Handsaming av pakkekrav"
@@ -3858,6 +3725,11 @@ msgstr "installer på ny"
msgid "Downgrade"
msgstr "nedgradert"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+#, fuzzy
+msgid "Remove"
+msgstr "^Fjern"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4043,6 +3915,22 @@ msgstr "ikkje installert"
msgid "Install/Upgrade"
msgstr "installert"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Reinsk ut"
+
+#: src/gtk/gui.cc:1382
+#, fuzzy
+msgid "Keep"
+msgstr "^Ta vare på"
+
+#: src/gtk/gui.cc:1387
+#, fuzzy
+msgid "Hold"
+msgstr "^Hald tilbake"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4103,121 +3991,121 @@ msgstr "ingen"
msgid "Unknown"
msgstr "Ukjend"
-#: 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 \"%s\"."
msgstr "Ingen pakkar passa med mønsteret «%s»."
-#: 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 "Pakke: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s-versjonar"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Install %s version %s"
msgstr "%s-versjonar"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "«libsigc++»-versjon: %s\n"
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, fuzzy, c-format
msgid "Don't hold %s at its current version."
msgstr "%BHald%b desse pakkane på noverande versjon: %n"
-#: 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 "Cancel any actions on %s."
msgstr "Pakkar som krev %s"
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, fuzzy, c-format
msgid "Cancel the purge of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, fuzzy, c-format
msgid "Cancel the removal of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, fuzzy, c-format
msgid "Cancel the upgrade of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, fuzzy, c-format
msgid "Cancel the installation of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, fuzzy, c-format
msgid "Cancel the downgrade of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, fuzzy, c-format
msgid "Cancel the reinstallation of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
msgid "Remove %s"
msgstr "^Fjern"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Reinsk ut"
-#: 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 for å merkje pakkar som automatisk installerte"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr "&m for å merkje pakkar som manuelt installerte"
-#: 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» er ein virtuell pakke gjeven av:\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: "
@@ -4243,28 +4131,28 @@ msgstr "%s; versjon %s vil bli installert automatisk"
msgid "%s is being installed manually."
msgstr "%s; versjon %s vil bli installert automatisk"
-#: 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 "Søk"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Byggjer vising"
-#: 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 "Byggjer vising"
-#: 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 "
@@ -4280,7 +4168,7 @@ msgstr ""
" At dette treet er her, kan bety at noko er øydelagt, anten på systemet ditt "
"eller i Debianarkivet."
-#: 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 "
@@ -4293,7 +4181,7 @@ msgstr ""
"ikkje vil vera nokon installerte pakkar som har eit «vikig» pakkekrav på "
"dei.\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 "
@@ -4303,7 +4191,7 @@ msgstr ""
" Desse pakkane kan oppgraderast, men dei er blitt haldt tilbake i deira "
"noverande tilstand for å unngå å øydeleggja pakkekrav."
-#: 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 "
@@ -4313,7 +4201,7 @@ msgstr ""
" Desse pakkane vert installert fordi nokon andre pakkar som du har valt å "
"installera krev dei."
-#: 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 "
@@ -4324,7 +4212,7 @@ msgstr ""
"pakkane krev ikkje lenger er tilgjengeleg eller fordi andre pakkar er i "
"konflikt med dei."
-#: 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 "
@@ -4334,7 +4222,7 @@ msgstr ""
" Ein eldre versjon av desse pakkane enn kva som no er installert vil bli "
"installert."
-#: 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 "
@@ -4344,7 +4232,7 @@ msgstr ""
" Desse pakkane kan oppgraderast, men du har bede om å halda dei tilbake på "
"noverande versjon."
-#: 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."
@@ -4352,7 +4240,7 @@ msgstr ""
"Pakkar som skal installerast på ny\n"
" Desse pakkane vil bli installert på ny."
-#: 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 "
@@ -4361,7 +4249,7 @@ msgstr ""
"Pakkar som blir installert\n"
" Desse pakkane har du manuelt bede om å installera på maskina di."
-#: 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."
@@ -4369,7 +4257,7 @@ msgstr ""
"Pakkar som skal fjernast\n"
" Desse pakkane har du bede om å fjerna frå maskina."
-#: 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."
@@ -4377,7 +4265,7 @@ msgstr ""
"Pakkar som skal oppgraderast\n"
" Desse pakkane vil bli oppdatert til ein nyare versjon."
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4388,7 +4276,7 @@ msgstr ""
" Desse pakkane vert installert fordi nokon andre pakkar som du har valt å "
"installera krev dei."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4409,114 +4297,120 @@ 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 "Pakke"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Ikkje installert"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
msgid "Removing %s is rejected."
msgstr "Set opp %s på ny\n"
-#: src/gtk/resolver.cc:337
+#: src/gtk/resolver.cc:377
#, fuzzy, c-format
msgid "Canceling the installation of %s is rejected."
msgstr "hald fram med installasjonen"
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, fuzzy, c-format
msgid "Canceling the removal of %s is rejected."
msgstr "hald fram med installasjonen"
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, fuzzy, c-format
msgid "Keeping %s at version %s is rejected."
msgstr ""
"\n"
"Curses-versjon: %s\n"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Installing %s version %s is rejected."
msgstr "%s-versjonar"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "«libsigc++»-versjon: %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-versjonar"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4526,7 +4420,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4534,257 +4428,267 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1172 src/solution_fragment.cc:108
+#: src/gtk/resolver.cc:1226 src/solution_fragment.cc:108
#, fuzzy, c-format
msgid "%s depends upon %s"
msgstr "krev"
-#: src/gtk/resolver.cc:1175 src/solution_fragment.cc:111
+#: src/gtk/resolver.cc:1229 src/solution_fragment.cc:111
#, fuzzy, c-format
msgid "%s pre-depends upon %s"
msgstr "krev på førehand"
-#: src/gtk/resolver.cc:1178 src/solution_fragment.cc:114
+#: src/gtk/resolver.cc:1232 src/solution_fragment.cc:114
#, fuzzy, c-format
msgid "%s suggests %s"
msgstr "føreslår"
-#: 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
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "tilrår"
-#: src/gtk/resolver.cc:1184 src/solution_fragment.cc:120
+#: src/gtk/resolver.cc:1238 src/solution_fragment.cc:120
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "konflikt med"
-#: src/gtk/resolver.cc:1187 src/solution_fragment.cc:123
+#: src/gtk/resolver.cc:1241 src/solution_fragment.cc:123
#, fuzzy, c-format
msgid "%s breaks %s"
msgstr "erstattar"
-#: src/gtk/resolver.cc:1190 src/solution_fragment.cc:126
+#: src/gtk/resolver.cc:1244 src/solution_fragment.cc:126
#, fuzzy, c-format
msgid "%s replaces %s"
msgstr "erstattar"
-#: src/gtk/resolver.cc:1193 src/solution_fragment.cc:129
+#: src/gtk/resolver.cc:1247 src/solution_fragment.cc:129
#, fuzzy, c-format
msgid "%s obsoletes %s"
msgstr "forelda"
-#: 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
#, fuzzy
msgid "Remove the following packages:"
msgstr "%BFjern%b desse pakkane: %n"
-#: 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
#, fuzzy
msgid "Install the following packages:"
msgstr "%BInstaller%b desse pakkane: %n"
-#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781
+#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848
#, fuzzy
msgid "Keep the following packages:"
msgstr "%BFjern%b desse pakkane: %n"
-#: 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
#, fuzzy
msgid "Upgrade the following packages:"
msgstr "%BOppgrader%b desse pakkane: %n"
-#: 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
#, fuzzy
msgid "Downgrade the following packages:"
msgstr "%BNedgrader%b desse pakkane: %n"
-#: 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:"
msgstr "%BFjern%b desse pakkane: %n"
-#: src/gtk/resolver.cc:1444
+#: src/gtk/resolver.cc:1502
#, fuzzy, c-format
msgid "Remove %s [<big>%s</big> (%s)]"
msgstr "^Fjern"
-#: src/gtk/resolver.cc:1451
+#: src/gtk/resolver.cc:1509
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Install %s [<big>%s</big> (%s)]"
msgstr "%s-versjonar"
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, fuzzy, c-format
msgid "Cancel the installation of %s"
msgstr "hald fram med installasjonen"
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, fuzzy, c-format
msgid "Cancel the removal of %s"
msgstr "hald fram med installasjonen"
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, fuzzy, c-format
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr ""
"\n"
"Curses-versjon: %s\n"
-#: src/gtk/resolver.cc:1472
+#: src/gtk/resolver.cc:1530
#, fuzzy, c-format
msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr "Lasta ned %sB på %s (%sB/s)."
-#: src/gtk/resolver.cc:1481
+#: src/gtk/resolver.cc:1539
#, fuzzy, c-format
msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr "Lasta ned %sB på %s (%sB/s)."
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>Remove</b> %s"
msgstr "^Fjern"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "^Fjern"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
msgid "<b>Keep</b> %s at version %s"
msgstr ""
"\n"
"Curses-versjon: %s\n"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
msgid "<b>keep</b> %s at version %s"
msgstr ""
"\n"
"Curses-versjon: %s\n"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+msgid "<b>Cancel</b> the installation of %s"
+msgstr "hald fram med installasjonen"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+msgid "<b>cancel</b> the installation of %s"
+msgstr "hald fram med installasjonen"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "%s versions"
msgid "<b>Install</b> %s %s"
msgstr "%s-versjonar"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "%s versions"
msgid "<b>install</b> %s %s"
msgstr "%s-versjonar"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "«libsigc++»-versjon: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "«libsigc++»-versjon: %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-versjonar"
-#: 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-versjonar"
-#: 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 "%s install"
msgid_plural "%s installs"
msgstr[0] "%d installeringar"
msgstr[1] "%d installeringar"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "%d fjerningar"
msgstr[1] "%d fjerningar"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "%d haldt tilbake"
msgstr[1] "%d haldt tilbake"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "%d oppgraderingar"
msgstr[1] "%d oppgraderingar"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "%d nedgraderingar"
msgstr[1] "%d nedgraderingar"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "Tilrådingar"
msgstr[1] "Tilrådingar"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Ingen fleire løysingar."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
msgid "No dependency solution was found."
msgstr "^Handsaming av pakkekrav"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Ingen fleire løysingar."
-#: 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 "Ingen fleire løysingar."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7611,6 +7515,68 @@ msgid "Download Changelog"
msgstr "Last ned endringslogg"
#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Installer/fjern pakkar"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Oppdater pakkeliste"
+
+#, fuzzy
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Marker ^Oppgraderbare"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Gløym nye pakkar"
+
+#, fuzzy
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Pakkar som krev %s"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Reinsk pakkemellomlageret"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Slett ^forelda filer"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Last inn igjen pakkemellomlageret"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Spel minesveipar"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Bli root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Avslutt"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "slett"
+
+#, fuzzy
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "^Handsaming av pakkekrav"
+
+#, fuzzy
#~ msgid "Dependency Chain"
#~ msgstr "^Handsaming av pakkekrav"
diff --git a/po/pl.po b/po/pl.po
index 4007a81c..2bc9cb26 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.11\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-08 11:06+0200\n"
"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -654,8 +654,8 @@ msgstr "Błąd krytyczny rozwiązywania problemów z zależnościami"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Uzupełnianie zależności"
-#: 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 "Błąd wewnętrzny: niespodziewane puste rozwiązanie."
@@ -1734,7 +1734,7 @@ msgstr ""
"zostało właściwie przygotowane."
#: 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 "Uzupełnianie niespełnionych zależności..."
@@ -1840,7 +1840,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Następujące pakiety mają niespełnione zależności:\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>"
@@ -1976,8 +1976,8 @@ msgstr "Zainstalowany automatycznie"
msgid "no"
msgstr "nie"
-#: 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 "Wersja: "
@@ -2056,12 +2056,12 @@ msgid "Obsoletes"
msgstr "Dezaktualizuje"
#: 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 "Udostępnia"
#: 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 "Opis: "
@@ -2221,8 +2221,7 @@ msgstr "Bieżący"
msgid "Candidate"
msgstr "Kandydat"
-#: 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 "Do instalacji"
@@ -2361,7 +2360,7 @@ msgstr "NIESPEŁNIONE"
msgid "UNAVAILABLE"
msgstr "NIEDOSTĘPNY"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Znaczniki"
@@ -2636,54 +2635,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 "Sekcja"
-#: 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 "Anuluj z^aplanowane zadania"
-#: 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 "\"-\": usunięcie pakietów"
-#: 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 "nie jest prawdziwym pakietem"
-#: 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 "Usunięcie następujących pakietów:"
-#: 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 "
@@ -3145,99 +3144,45 @@ msgstr ""
msgid "_File"
msgstr "Fałsz"
-#: 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 "Przeprowadza zaplanowane instalacje/usunięcia"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "Za^instaluj/usuń pakiety"
-
-#: 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 "Sprawdza dostępność nowszych wersji pakietów"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Uaktualnij listę pakietów"
-
-#: 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 "Zaznacza do aktualizacji wszystkie możliwe nie zatrzymane pakiety"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Zaznacz ^do aktualizacji"
-
-#: 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 "Usuwa informacje o tym, które pakiety są nowe"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Zapomnij o nowościach"
-
-#: 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 ""
"Anuluje wszystkie zaplanowane instalacje, usunięcia, wstrzymania i "
"aktualizacje."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Anuluj z^aplanowane zadania"
-
-#: 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 "Usuwa wszystkie pobrane wcześniej pliki"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Wyczyść ^archiwum pakietów"
-
-#: 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 "Usuwa pliki pakietów, które nie są dostępne do pobrania"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "^Usuń nieaktualne pliki"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Ponownie odczytuje archiwum pakietów"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Odśwież archiwum pakietów"
-
-#: 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 "Tracenie czasu na poszukiwaniu min"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Saper"
-
-#: 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"
@@ -3245,261 +3190,200 @@ msgstr ""
"Użycie \"su\" do uzyskania uprawnień administratora. Program zostanie "
"zrestartowany, ale ustawienia będą zachowane"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Uzyskaj prawa administratora"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Kończy program"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Zakończ"
-
-#: 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 "Cofa ostatnią operację lub grupę operacji"
-#: 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 "usunięcie"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pakiet"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Widoki"
-#: 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 "Zależności"
-
-#: 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 "usunięcie"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Pomoc"
-#: 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 "Uaktualnianie list"
-#: 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 "Pakiety"
-#: 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 "Przegląd"
-#: 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 "Zależności"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Zainstalowany"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Do usunięcia"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Wyczyść"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Do pozostawienia"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Do zatrzymania"
-
-#: 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 "Usuwa ograniczenie wyświetlanej listy pakietów"
-#: 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 "Ogranicza wyświetlaną listę pakietów"
-#: 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 "usunięcie"
+
+#: 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 "Znajdź"
-#: 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 "ponowna instalacja"
-#: 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 "Błąd "
-#: 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 "Zależności %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Dziennik zmian"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Fałsz"
-#: 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 "Znaczniki"
-#: 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 "Stan"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Nieznana akcja: %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 "
@@ -3508,148 +3392,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 "Nieznana akcja: %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 "Przełącz ^odrzucenie"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Preferencje"
-#: 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 "Stan"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Wyświetl rozwiązanie"
-#: 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 "Wybiera następne rozwiązanie problemów z zależnościami"
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Wyświetl rozwiązanie"
+#: 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 "Wykonuje działania składające się na aktualnie wybrane rozwiązanie"
-#: 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 "Do uaktualnienia"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Pakiet źródłowy: "
-#: 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 "Podręcznik"
-#: 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 "Do uaktualnienia"
-#: 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 "tak"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3706,21 +3573,21 @@ msgstr "Pobieranie dziennika zmian"
msgid "Downloading changelogs"
msgstr "Pobieranie dziennika zmian"
-#: 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 pobierania dzienników zmian"
-#: 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"
@@ -3730,19 +3597,19 @@ msgstr[0] "%d aktualizacja"
msgstr[1] "%d aktualizacje"
msgstr[2] "%d aktualizacji"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "nie zainstalowany"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Nie można znaleźć pakietu %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 "
@@ -3754,7 +3621,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'>"
@@ -3766,49 +3633,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 "Błąd wewnętrzny: domyślna konfiguracja kolumn jest błędna"
-#: 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 "Zależności"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Zależności"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Zależności"
-#: 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."
@@ -4074,6 +3941,10 @@ msgstr "Do przeinstalowania"
msgid "Downgrade"
msgstr "Do cofnięcia"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Do usunięcia"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4273,6 +4144,20 @@ msgstr "niezainstalowany"
msgid "Install/Upgrade"
msgstr "Zainstalowany"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Wyczyść"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Do pozostawienia"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Do zatrzymania"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4338,133 +4223,133 @@ msgstr "nie"
msgid "Unknown"
msgstr "Nieznane"
-#: 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 "Nie znaleziono pakietów pasujących do wzorca \"%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 "Pakiet: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "Wersje %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 "Instalacja(%s udostępnia %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 " wersja 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 "Zatrzymanie bieżących wersji następujących pakietów:"
-#: 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 "Anuluj z^aplanowane zadania"
-#: 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 "Odwołanie usunięcia %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 "Odwołanie usunięcia %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 "Odwołanie usunięcia %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 "Odwołanie instalacji %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 "Odwołanie usunięcia %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 "Odwołanie instalacji %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Usunięcie(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Wyczyść"
-#: 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\": oznaczenie pakietów jako automatycznie zainstalowanych"
-#: 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 "Pakiet \"%s\" jest zainstalowany ręcznie\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\" jest pakietem wirtualnym udostępnianym przez:\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: "
@@ -4494,28 +4379,28 @@ msgstr "%s, zostanie automatycznie zainstalowany"
msgid "%s is being installed manually."
msgstr "%s, zostanie automatycznie zainstalowany"
-#: 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 "Znajdź"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Tworzenie widoku"
-#: 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 "Tworzenie widoku"
-#: 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 "
@@ -4530,7 +4415,7 @@ msgstr ""
" Obecność tego pozycji wskazuje, że coś jest nie w porządku z tym systemem "
"lub archiwum Debiana."
-#: 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 "
@@ -4542,7 +4427,7 @@ msgstr ""
"spełnienia zależności a zaplanowane akcje spowodują, że nie będzie "
"zainstalowany żaden pakiet deklarujący \"ważną\" zależność od nich.\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 "
@@ -4552,7 +4437,7 @@ msgstr ""
" Te pakiety mogłyby być uaktualnione, ale zostały zatrzymane aby uniknąć "
"powstania niespełnionych zależności."
-#: 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 "
@@ -4562,7 +4447,7 @@ msgstr ""
" Te pakiety zostaną zainstalowane, ponieważ są wymagane przez inne pakiety "
"wybrane do instalacji."
-#: 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 "
@@ -4572,7 +4457,7 @@ msgstr ""
" Te pakiety zostaną usunięte, ponieważ jakieś pakiety, od których zależą nie "
"są już dostępne, lub ponieważ jakieś pakiety wchodzą z nimi w konflikt."
-#: 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 "
@@ -4582,7 +4467,7 @@ msgstr ""
" Zostaną zainstalowane starsze wersje tych pakietów niż zainstalowane "
"obecnie."
-#: 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 "
@@ -4592,7 +4477,7 @@ msgstr ""
" Te pakiety mogłyby być uaktualnione, ale zażądano pozostawienia ich w "
"bieżących wersjach."
-#: 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."
@@ -4600,7 +4485,7 @@ msgstr ""
"Pakiety do ponownej instalacji\n"
" Te pakiety zostaną zainstalowane ponownie."
-#: 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 "
@@ -4609,7 +4494,7 @@ msgstr ""
"Pakiety do instalacji\n"
" Te pakiety zostały ręcznie wybrane do instalacji."
-#: 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."
@@ -4617,7 +4502,7 @@ msgstr ""
"Pakiety do usunięcia\n"
" Te pakiety zostały ręcznie wybrane do usunięcia."
-#: 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."
@@ -4625,7 +4510,7 @@ msgstr ""
"Pakiety do aktualizacji\n"
" Te pakiety zostaną zaktualizowane do nowszej wersji."
-#: 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 "
@@ -4635,7 +4520,7 @@ msgstr ""
" Te pakiety nie są całkowicie zainstalowane i skonfigurowane, zostanie "
"podjęta próba dokończenia ich instalacji."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4656,119 +4541,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 "Pakiet"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "nie zainstalowany"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Usuwanie %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 "Odwołanie instalacji %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 "Odwołanie usunięcia %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 "Zatrzymanie %F w wersji %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 "Instalacja(%s udostępnia %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 " wersja 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 "Wersje %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."
@@ -4779,7 +4670,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 ""
@@ -4788,192 +4679,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 wymaga %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 wymaga wstępnie %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 sugeruje %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 poleca %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 jest w konflikcie z %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 narusza zależności %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 zastępuje %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 dezaktualizuje %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 "Usunięcie następujących pakietów:"
-#: 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 "Instalacja następujących pakietów:"
-#: 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 "Usunięcie następujących pakietów:"
-#: 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 "Aktualizacja następujących pakietów:"
-#: 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 "Cofnięcie następujących pakietów do wcześniejszych wersji:"
-#: 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 "Pozostawienie następujących problemów z zależnościami:%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 "Usunięcie %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 "Instalacja %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 "Odwołanie instalacji %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 "Odwołanie usunięcia %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 "Zatrzymanie %F w wersji %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 "Aktualizacja %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 "Cofnięcie %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 "Usunięcie(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Usunięcie(%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 "Zatrzymanie %F w wersji %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 "Zatrzymanie %F w wersji %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 "Odwołanie instalacji %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Odwołanie instalacji %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Instalacja %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 "Instalacja %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 " wersja 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 " wersja 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 "Wersje %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 "Wersje %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"
@@ -4983,7 +4886,7 @@ msgstr[0] "%d instalacja"
msgstr[1] "%d instalacje"
msgstr[2] "%d instalacji"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4993,7 +4896,7 @@ msgstr[0] "%d usunięcie"
msgstr[1] "%d usunięcia"
msgstr[2] "%d usunięć"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -5003,7 +4906,7 @@ msgstr[0] "%d zatrzymanie"
msgstr[1] "%d zatrzymania"
msgstr[2] "%d zatrzymań"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5013,7 +4916,7 @@ msgstr[0] "%d aktualizacja"
msgstr[1] "%d aktualizacje"
msgstr[2] "%d aktualizacji"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5023,7 +4926,7 @@ msgstr[0] "%d cofnięcie"
msgstr[1] "%d cofnięcia"
msgstr[2] "%d cofnięć"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5032,35 +4935,35 @@ msgstr[0] "P^olecane pakiety"
msgstr[1] "P^olecane pakiety"
msgstr[2] "P^olecane pakiety"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Nie ma więcej rozwiązań."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Zależności"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Nie ma więcej rozwiązań."
-#: 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 "Nie ma więcej rozwiązań."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7883,6 +7786,71 @@ msgstr "Pobieranie dziennika zmian"
msgid "Download Changelog"
msgstr "Pobierz dziennik zmian"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "Za^instaluj/usuń pakiety"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Uaktualnij listę pakietów"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Zaznacz ^do aktualizacji"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Zapomnij o nowościach"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Anuluj z^aplanowane zadania"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Wyczyść ^archiwum pakietów"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "^Usuń nieaktualne pliki"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Odśwież archiwum pakietów"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Saper"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Uzyskaj prawa administratora"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Zakończ"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "usunięcie"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Zależności"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(dla %s)"
diff --git a/po/pt.po b/po/pt.po
index f0bfc33c..a6e36b08 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-06-28 08:32+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianPT.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -657,8 +657,8 @@ msgstr "Erro fatal no resolvedor"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] A resolver as dependências"
-#: 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 "Erro interno: solução nula não esperada."
@@ -1741,7 +1741,7 @@ msgstr ""
"dependências."
#: 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 "A resolver as dependências..."
@@ -1849,7 +1849,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Os seguintes pacotes têm dependências não satisfeitas:\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>"
@@ -1985,8 +1985,8 @@ msgstr "Instalado automaticamente"
msgid "no"
msgstr "não"
-#: 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 "Versão: "
@@ -2065,12 +2065,12 @@ msgid "Obsoletes"
msgstr "Obsoleta"
#: 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 "Disponibiliza"
#: 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 "Descrição: "
@@ -2226,8 +2226,7 @@ msgstr "Actual"
msgid "Candidate"
msgstr "Candidato"
-#: 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 "Instalar"
@@ -2371,7 +2370,7 @@ msgstr "(NÃO SATISFEITAS)"
msgid "UNAVAILABLE"
msgstr "INDISPONÍVEL"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Tags"
@@ -2650,54 +2649,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 "Secção"
-#: 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 "Canc^elar acções pendentes"
-#: 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 "'-' para remover pacotes"
-#: 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 "não é um pacote verdadeiro"
-#: 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 "Remover os seguintes pacotes:"
-#: 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 "
@@ -3166,101 +3165,47 @@ msgstr ""
msgid "_File"
msgstr "Falso"
-#: 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 "Executar todas as instalações e remoções pendentes"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Instalar/remover pacotes"
-
-#: 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 "Procurar por novas versões de pacotes"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "Act^Ualizar a lista de pacotes"
-
-#: 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 ""
"Marcar para actualização todos os pacotes actualizáveis que não sejam para "
"manter"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Marcar Actualizável ^g"
-
-#: 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 "Esquecer os pacotes que são \"novos\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^F Esquecer novos pacotes"
-
-#: 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 ""
"Cancelar todas as instalações pendentes, remoções, suspensos (hold) e "
"actualizações."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Canc^elar acções pendentes"
-
-#: 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 "Apagar ficheiros de pacotes que foram previamente transferidos"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Limpar ^Cache de pacotes"
-
-#: 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 "Apagar ficheiros de pacotes que já não possam ser transferidos"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Limpar ficheiros ^obsoletos"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Reler a cache de pacotes"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Reler cache de pacotes"
-
-#: 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 "Gaste tempo a tentar encontrar minas"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^P Jogar Campo Minado"
-
-#: 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"
@@ -3268,261 +3213,200 @@ msgstr ""
"Executar 'su' para se tornar root; isto irá reiniciar o programa, mas as "
"suas configurações serão mantidas"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Tornar-se root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Sair do programa"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Q Sair"
-
-#: 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 "Desfaz a última operação ou grupo de operações"
-#: 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 "remover"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pacote"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Vistas"
-#: 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 "Lidar com dependências"
-
-#: 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 "remover"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Ajuda"
-#: 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 "Lista de Actualizações"
-#: 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 "Pacotes"
-#: 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 "Ver antes"
-#: 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 "Resolver"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Instalado"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Remover"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Purgar"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Manter"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Manter a versão"
-
-#: 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 "Remover o filtro da lista de pacotes"
-#: 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 "Aplicar um filtro à lista de pacotes"
-#: 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 "remover"
+
+#: 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 "Procurar"
-#: 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 "reinstalar"
-#: 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 "Err "
-#: 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 "Dependências de %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 "Falso"
-#: 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 "Tags"
-#: 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 "Estado"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Tipo de acção desconhecida: %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 "
@@ -3531,150 +3415,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 "Tipo de acção desconhecida: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "ver uma explicação das mudanças na solução"
-
-#: 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 "Alternar ^Rejeitado"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Preferências"
-#: 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 "Estado"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Examinar Solução"
-#: 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 "Escolha a próxima solução para os problemas de dependências."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Examinar Solução"
+#: 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 "Executar as acções contidas na solução actualmente seleccionada."
-#: 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 "Actualizar"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Pacote de Fonte: "
-#: 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 "Manual"
-#: 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 "Actualizar"
-#: 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 "sim"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3727,21 +3592,21 @@ msgstr "A efectuar a transferência do registo de alterações"
msgid "Downloading changelogs"
msgstr "A efectuar a transferência do registo de alterações"
-#: 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 a utilizar para fazer a transferência dos 'changelogs'"
-#: 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"
@@ -3750,19 +3615,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d actualização"
msgstr[1] "%d actualizações"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Não Instalado"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Não foi possível localizar o pacote %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 "
@@ -3773,7 +3638,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3784,49 +3649,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Erro interno: String de coluna padrão não é interpretável"
-#: 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 "Lidar com dependências"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Lidar com dependências"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Lidar com dependências"
-#: 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."
@@ -4092,6 +3957,10 @@ msgstr "Reinstalar"
msgid "Downgrade"
msgstr "Downgrade"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Remover"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4289,6 +4158,20 @@ msgstr "não instalado"
msgid "Install/Upgrade"
msgstr "Instalado"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Purgar"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Manter"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Manter a versão"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4354,133 +4237,133 @@ msgstr "não"
msgid "Unknown"
msgstr "Desconhecido"
-#: 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 "Nenhum pacote coincidiu com o padrão \"%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 "Pacote: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s versões"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "A instalar (%s disponibiliza %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 versão: %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 "Manter os seguintes pacotes na sua versão actual:"
-#: 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 "Canc^elar acções pendentes"
-#: 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 "Cancelar a remoção de %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 "Cancelar a remoção de %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 "Cancelar a remoção de %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 "Cancelar a instalação de %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 "Cancelar a remoção de %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 "Cancelar a instalação de %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Remover(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Purgar"
-#: 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' para marcar pacotes como automaticamente instalados"
-#: 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 "O pacote \"%s\" está instalado manualmente.\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\" é um pacote virtual disponibilizado por:\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: "
@@ -4510,28 +4393,28 @@ msgstr "%s; será instalado automaticamente"
msgid "%s is being installed manually."
msgstr "%s; será instalado automaticamente"
-#: 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 "Procurar"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "A criar vista"
-#: 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 "A criar vista"
-#: 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 "
@@ -4547,7 +4430,7 @@ msgstr ""
" A presença desta árvore provavelmente indica que algo está com problemas no "
"seu sistema ou no repositório 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 "
@@ -4559,7 +4442,7 @@ msgstr ""
"para satisfazer dependências e a acção planeada resultará em nenhum pacote "
"instalado que declare uma dependência 'importante' para estes.\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 "
@@ -4569,7 +4452,7 @@ msgstr ""
" Estes pacotes podem ser actualizados, mas foram mantidos no seu estado "
"actual para evitar dependências não satisfeitas."
-#: 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 "
@@ -4579,7 +4462,7 @@ msgstr ""
" Estes pacotes estão a ser instalados porque são necessários a outro pacote "
"que escolheu para ser instalado."
-#: 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 "
@@ -4589,7 +4472,7 @@ msgstr ""
" Estas pacotes irão ser removidos porque uma ou mais dependências já não "
"estão disponíveis ou porque outro pacote entra em conflito com estes."
-#: 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 "
@@ -4599,7 +4482,7 @@ msgstr ""
" Será instalada uma versão mais antiga do que a versão que está actualmente "
"instalada."
-#: 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 "
@@ -4609,7 +4492,7 @@ msgstr ""
" Estes pacotes podem ser actualizados mas pediu que os mesmos fossem "
"mantidos nas suas versões actuais."
-#: 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."
@@ -4617,7 +4500,7 @@ msgstr ""
"Pacotes a serem reinstalados\n"
" Estes pacotes serão reinstalados."
-#: 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 "
@@ -4627,7 +4510,7 @@ msgstr ""
"Estes pacotes foram seleccionados manualmente para serem instalados no seu "
"computador."
-#: 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."
@@ -4635,7 +4518,7 @@ msgstr ""
"Pacotes a serem removidos\n"
" Estes pacotes foram seleccionados manualmente para remoção."
-#: 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."
@@ -4643,7 +4526,7 @@ msgstr ""
"Pacotes a serem actualizados\n"
" Estes pacotes irão ser actualizados para uma versão mais recente."
-#: 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 "
@@ -4653,7 +4536,7 @@ msgstr ""
" Estes pacotes nãoo estão totalmente instalados e configurados; será feita "
"uma tentatica para completar a sua instalação."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4674,117 +4557,123 @@ 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 "Pacote"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Não Instalado"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "A remover %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 "Cancelar a instalação de %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 "Cancelar a remoção de %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 "Manter %F na versão %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 "A instalar (%s disponibiliza %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 versão: %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 versões"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4794,7 +4683,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4802,192 +4691,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 depende de %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 pré-depende de %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 sugere %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 recomenda %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 em conflito com %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 estraga %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 substitui %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 torna obsoleto %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 "Remover os seguintes pacotes:"
-#: 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 "Instalar Os seguintes pacotes:"
-#: 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 "Remover os seguintes pacotes:"
-#: 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 "Actualizar os seguintes pacotes:"
-#: 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 "Downgrade aos seguintes pacotes:"
-#: 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 "Deixar as seguintes dependências por resolver:%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 "Remover %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 "Instalar %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 "Cancelar a instalação de %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 "Cancelar a remoção de %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 "Manter %F na versão %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 "Actualizar %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 "Downgrade de %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 "Remover(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Remover(%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 "Manter %F na versão %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 "Manter %F na versão %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 "Cancelar a instalação de %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Cancelar a instalação de %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Instalar %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 "Instalar %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 versão: %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 versão: %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 versões"
-#: 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 versões"
-#: 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"
@@ -4996,7 +4897,7 @@ msgid_plural "%s installs"
msgstr[0] "%d instalação"
msgstr[1] "%d instalações"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -5005,7 +4906,7 @@ msgid_plural "%s removes"
msgstr[0] "%d remoção"
msgstr[1] "%d remoções"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -5014,7 +4915,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d mantido"
msgstr[1] "%d mantidos"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5023,7 +4924,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d actualização"
msgstr[1] "%d actualizações"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5032,7 +4933,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d downgrade"
msgstr[1] "%d downgrades"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5040,35 +4941,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Auditar ^Recomendações"
msgstr[1] "Auditar ^Recomendações"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Não há mais soluções."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Lidar com dependências"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Não há mais soluções."
-#: 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 "Não há mais soluções."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7927,6 +7828,76 @@ msgstr "A efectuar a transferência do registo de alterações"
msgid "Download Changelog"
msgstr "Transferência do 'Changelog'"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Instalar/remover pacotes"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "Act^Ualizar a lista de pacotes"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Marcar Actualizável ^g"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^F Esquecer novos pacotes"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Canc^elar acções pendentes"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Limpar ^Cache de pacotes"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Limpar ficheiros ^obsoletos"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Reler cache de pacotes"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^P Jogar Campo Minado"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Tornar-se root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Q Sair"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "remover"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Lidar com dependências"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "ver uma explicação das mudanças na solução"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(para %s)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 43e6d549..dfb66515 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-06-15 18:07-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -654,8 +654,8 @@ msgstr "Erro fatal no resolvedor"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Resolvendo dependências"
-#: 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 "Erro interno: solução nula inesperada."
@@ -1738,7 +1738,7 @@ msgstr ""
"criado."
#: 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 "Resolvendo dependências..."
@@ -1847,7 +1847,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Os pacotes a seguir possuem dependências não satisfeitas:\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 "<NULO>"
@@ -1983,8 +1983,8 @@ msgstr "Automaticamente instalado"
msgid "no"
msgstr "não"
-#: 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 "Versão: "
@@ -2063,12 +2063,12 @@ msgid "Obsoletes"
msgstr "Torna obsoleto"
#: 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 "Fornece"
#: 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 "Descrição: "
@@ -2223,8 +2223,7 @@ msgstr "Atual"
msgid "Candidate"
msgstr "Candidato"
-#: 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 "Instalar"
@@ -2364,7 +2363,7 @@ msgstr "NÃO SATISFEITAS"
msgid "UNAVAILABLE"
msgstr "NÃO DISPONÍVEIS"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Tags"
@@ -2641,54 +2640,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 "Seção"
-#: 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 "Canc^elar ações pendentes"
-#: 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 "'-' para remover pacotes"
-#: 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 "não é um pacote real"
-#: 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 "Remover os pacotes a seguir:"
-#: 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 "
@@ -3152,99 +3151,45 @@ msgstr ""
msgid "_File"
msgstr "Falso"
-#: 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 "Executar todas as instalações e remoções pendentes"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Instalar/remover pacotes"
-
-#: 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 "Checar por novas versões de pacotes"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "At^ualizar a lista de pacotes"
-
-#: 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 ""
"Marcar para atualização todos os pacotes atualizáveis que não estejam retidos"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Marcar atualizáveis (^g)"
-
-#: 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 "Esquecer quais pacotes são \"novos\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "Esquecer novos pacotes (^F)"
-
-#: 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 ""
"Cancelar todas as instalações, remoções, retenções e atualizações pendentes."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Canc^elar ações pendentes"
-
-#: 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 "Excluir arquivos de pacotes que foram previamente baixados"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Limpar ^cache de pacotes"
-
-#: 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 "Excluir arquivos de pacotes que não podem mais ser baixados"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Limpar arquivos ^obsoletos"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Recarregar o cache de pacotes"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Recarregar cache de pacotes"
-
-#: 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 "Perca tempo tentando encontrar minas"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Jogar cam^po minado"
-
-#: 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"
@@ -3252,261 +3197,200 @@ msgstr ""
"Executar 'su' para tornar-se root; isto irá reiniciar o programa, mas suas "
"configurações serão preservadas"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Tornar-se root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Sair do programa"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "Sair (^Q)"
-
-#: 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 "Desfaz a última operação ou grupo de operações do pacote"
-#: 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 "remover"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pacote"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Visões"
-#: 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 "Gerenciamento de dependências"
-
-#: 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 "remover"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Ajuda"
-#: 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 "Atualização da lista"
-#: 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 "Pacotes"
-#: 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 "Pré-visualização"
-#: 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 "Resolvedor"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Instalado"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Remover"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "Ex^purgar"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Manter"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Reter"
-
-#: 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 "Remover o filtro da lista de pacotes"
-#: 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 "Aplicar um filtro à lista de pacotes"
-#: 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 "remover"
+
+#: 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 "Pesquisar"
-#: 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 "reinstalar"
-#: 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 "Err "
-#: 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 "Dependências de %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "Log de mudanças (^C)"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Falso"
-#: 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 "Tags"
-#: 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 "Estado"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Tipo de ação desconhecida: %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 "
@@ -3515,150 +3399,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 "Tipo de ação desconhecida: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "visualizar uma explicação das mudanças na solução"
-
-#: 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 "^Rejeitar ação"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Preferências"
-#: 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 "Estado"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Examinar solução"
-#: 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 "Seleciona a próxima solução para os problemas de dependência."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Examinar solução"
+#: 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 "Executar as ações contidas na solução atualmente selecionada."
-#: 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 "Atualizar"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Pacote Fonte: "
-#: 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 "Manual"
-#: 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 "Atualizar"
-#: 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 "sim"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3711,21 +3576,21 @@ msgstr "Baixando logs de mudanças"
msgid "Downloading changelogs"
msgstr "Baixando logs de mudanças"
-#: 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 a ser usada para baixar os logs de mudanças"
-#: 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"
@@ -3734,19 +3599,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d atualização"
msgstr[1] "%d atualizações"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Não Instalado"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Impossível localizar pacote %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 "
@@ -3757,7 +3622,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3768,49 +3633,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Erro interno: String de coluna padrão não é analisável"
-#: 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 "Gerenciamento de dependências"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Gerenciamento de dependências"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Gerenciamento de dependências"
-#: 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."
@@ -4075,6 +3940,10 @@ msgstr "Reinstalar"
msgid "Downgrade"
msgstr "Reverter"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Remover"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4270,6 +4139,20 @@ msgstr "não instalado"
msgid "Install/Upgrade"
msgstr "Instalado"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "Ex^purgar"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Manter"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Reter"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4335,133 +4218,133 @@ msgstr "não"
msgid "Unknown"
msgstr "Desconhecido"
-#: 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 "Nenhum pacote combinou com o padrão \"%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 "Pacote: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s versões"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Instalar(%s fornece %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 " versão 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 "Manter os pacotes a seguir em suas versões atuais:"
-#: 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 "Canc^elar ações pendentes"
-#: 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 "Cancelar a remoção de %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 "Cancelar a remoção de %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 "Cancelar a remoção de %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 "Cancelar a instalação de %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 "Cancelar a remoção de %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 "Cancelar a instalação de %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Remover(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "Ex^purgar"
-#: 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' para marcar pacotes como automaticamente instalados"
-#: 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 "O pacote \"%s\" está instalado manualmente.\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\" é um pacote virtual fornecido por:\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: "
@@ -4491,28 +4374,28 @@ msgstr "%s; serão automaticamente instalados"
msgid "%s is being installed manually."
msgstr "%s; serão automaticamente instalados"
-#: 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 "Pesquisar"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Construindo visão"
-#: 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 "Construindo visão"
-#: 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 "
@@ -4528,7 +4411,7 @@ msgstr ""
" A presença desta árvore provavelmente indica que algo está quebrado em seu "
"sistema ou no repositório 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 "
@@ -4540,7 +4423,7 @@ msgstr ""
"instalados para satisfazer dependências e a ação planejada resultará em "
"nenhum pacote declarando uma dependência 'importante' dos mesmos.\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 "
@@ -4550,7 +4433,7 @@ msgstr ""
" Estes pacotes podem ser atualizados, mas foram mantidos em seu estado atual "
"para evitar dependências quebradas."
-#: 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 "
@@ -4560,7 +4443,7 @@ msgstr ""
" Estes pacotes estão sendo instalados porque são requeridos por outro pacote "
"que você selecionou para ser instalado."
-#: 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 "
@@ -4570,7 +4453,7 @@ msgstr ""
" Estes pacotes estão sendo removidos porque uma ou mais de suas dependências "
"não estão mais disponíveis ou porque outro pacote conflita com os mesmos."
-#: 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 "
@@ -4579,7 +4462,7 @@ msgstr ""
"Pacotes a serem revertidos\n"
" Uma versão anterior àquela dos pacotes instalados atualmente será instalada."
-#: 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 "
@@ -4589,7 +4472,7 @@ msgstr ""
" Estes pacotes podem ser atualizados mas você pediu que os mesmos fossem "
"mantidos em suas versões atuais."
-#: 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."
@@ -4597,7 +4480,7 @@ msgstr ""
"Pacotes a serem reinstalados\n"
" Estes pacotes serão reinstalados."
-#: 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 "
@@ -4607,7 +4490,7 @@ msgstr ""
" Estes pacotes foram selecionados manualmente por você para serem instalados "
"em seu computador."
-#: 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."
@@ -4615,7 +4498,7 @@ msgstr ""
"Pacotes a serem removidos\n"
" Estes pacotes foram manualmente selecionados para serem removidos."
-#: 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."
@@ -4623,7 +4506,7 @@ msgstr ""
"Pacotes a serem atualizados\n"
" Estes pacotes serão atualizados para uma versão mais nova."
-#: 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 "
@@ -4633,7 +4516,7 @@ msgstr ""
" Estes pacotes não estão totalmente instalados e configurados; uma tentativa "
"será feita para completar a instalação."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4654,117 +4537,123 @@ 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 "Pacote"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Não Instalado"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Removendo %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 "Cancelar a instalação de %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 "Cancelar a remoção de %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 "Manter %F na versão %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 "Instalar(%s fornece %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 " versão 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 versões"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4774,7 +4663,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4782,192 +4671,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 depende de %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 pré-depende de %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 sugere %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 recomenda %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 conflita com %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 quebra %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 substitui %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 obsoleta %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 "Remover os pacotes a seguir:"
-#: 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 "Instalar os pacotes a seguir:"
-#: 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 "Remover os pacotes a seguir:"
-#: 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 "Atualizar os pacotes a seguir:"
-#: 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 "Reverter a versão dos pacotes a seguir:"
-#: 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 "Manter as seguintes dependências não resolvidas:%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 "Remover %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 "Instalar %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 "Cancelar a instalação de %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 "Cancelar a remoção de %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 "Manter %F na versão %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 "Atualizar %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 "Reverter %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 "Remover(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Remover(%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 "Manter %F na versão %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 "Manter %F na versão %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 "Cancelar a instalação de %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Cancelar a instalação de %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Instalar %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 "Instalar %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 " versão 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 " versão 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 versões"
-#: 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 versões"
-#: 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"
@@ -4976,7 +4877,7 @@ msgid_plural "%s installs"
msgstr[0] "%d instalação"
msgstr[1] "%d instalações"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4985,7 +4886,7 @@ msgid_plural "%s removes"
msgstr[0] "%d remoção"
msgstr[1] "%d remoções"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4994,7 +4895,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d mantido"
msgstr[1] "%d mantidos"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5003,7 +4904,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d atualização"
msgstr[1] "%d atualizações"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5012,7 +4913,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d reversão"
msgstr[1] "%d reversões"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5020,35 +4921,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Auditar ^recomendações"
msgstr[1] "Auditar ^recomendações"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Sem mais soluções."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Gerenciamento de dependências"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Sem mais soluções."
-#: 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 "Sem mais soluções."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7891,6 +7792,76 @@ msgstr "Baixando logs de mudanças"
msgid "Download Changelog"
msgstr "Baixar logs de mudanças"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Instalar/remover pacotes"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "At^ualizar a lista de pacotes"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Marcar atualizáveis (^g)"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "Esquecer novos pacotes (^F)"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Canc^elar ações pendentes"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Limpar ^cache de pacotes"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Limpar arquivos ^obsoletos"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Recarregar cache de pacotes"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Jogar cam^po minado"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Tornar-se root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "Sair (^Q)"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "remover"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Gerenciamento de dependências"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "visualizar uma explicação das mudanças na solução"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(para %s)"
diff --git a/po/ro.po b/po/ro.po
index b32628dd..01aaca8c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-10-17 15:42+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -658,8 +658,8 @@ msgstr "Eroare fatală în rezolvator"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Se rezolvă dependențele"
-#: 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 "Eroare internă: soluție nulă neașteptată"
@@ -1751,7 +1751,7 @@ msgstr ""
"de dependențe."
#: 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 "Se rezolvă dependențele..."
@@ -1860,7 +1860,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Următoarele pachete nu au dependențele îndeplinite:\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>"
@@ -1996,8 +1996,8 @@ msgstr "Instalat automat"
msgid "no"
msgstr "nu"
-#: 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 "Versiune: "
@@ -2076,12 +2076,12 @@ msgid "Obsoletes"
msgstr "Învechește"
#: 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 "Furnizează"
#: 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 "Descriere: "
@@ -2240,8 +2240,7 @@ msgstr "Curentă"
msgid "Candidate"
msgstr "Candidată"
-#: 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 "Instalare"
@@ -2383,7 +2382,7 @@ msgstr "NESATISFĂCUT"
msgid "UNAVAILABLE"
msgstr "INDISPONIBIL"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Etichete"
@@ -2660,54 +2659,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 "Secțiune"
-#: 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 "A^nularea acțiunilor în desfășurare"
-#: 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 "'-' pentru a șterge pachete"
-#: 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 "nu este un pachet real"
-#: 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 "Se șterg următoarele pachete:"
-#: 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 "
@@ -3174,100 +3173,46 @@ msgstr ""
msgid "_File"
msgstr "Fals"
-#: 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 "Execută toate instalările și ștergerile nerezolvate"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Instalează/șterge pachete"
-
-#: 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 "Verifică existența a noi versiuni de pachete"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Actualizează lista de pachete"
-
-#: 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 ""
"Marchează toate pachetele ce ar putea fi înnoite care nu sunt ținute la "
"înnoire"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "^Marchează ce se poate înnoi"
-
-#: 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 "Uită de pachetele care sunt \"noi\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "Uită de ^pachetele noi"
-
-#: 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 ""
"Anulează toate instalările, ștergerile, păstrările și înoirile în curs."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "A^nularea acțiunilor în desfășurare"
-
-#: 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 "Șterge fișierele pachetelor care-au fost anterior descărcate"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Curăță cache-ul de pachete"
-
-#: 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 "Șterge fișierele pachetelor ce nu mai pot fi descărcate"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Curăță ^fișierele învechite"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Reîncărcare a cache-ului de pachete"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Reîncarcă cache-ul de pachete"
-
-#: 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 "Pierdeți timpul încercând să găsiți mine"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Joacă Detectorul de mine"
-
-#: 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"
@@ -3275,261 +3220,200 @@ msgstr ""
"Execută 'su' pentru a deveni root; asta va reporni programul, dar setările "
"dumneavoastră vor fi păstrate"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Devin root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Ieșire din program"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "I^eșire"
-
-#: 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 "Renunță la ultima operațiune de pachet sau grup de operațiuni"
-#: 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 "șterge"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pachet"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Vizualizări"
-#: 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 "Manevrarea dependențelor"
-
-#: 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 "șterge"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Ajutor"
-#: 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 "Actualizează Listă"
-#: 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 "Pachete"
-#: 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 "Previzualizare"
-#: 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 "Rezolvator"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Instalat"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Ștergere"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Curăță"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Ține"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Păstrare"
-
-#: 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 "Șterge filtrul listei de pachete"
-#: 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 "Aplică un filtru listei de pachete"
-#: 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 "șterge"
+
+#: 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 "Căutare"
-#: 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 "reinstalează"
-#: 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 "Er "
-#: 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 "Dependențele %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "Jurnal de modifi^cări"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Fals"
-#: 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 "Etichete"
-#: 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 "Stare"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Tip de acțiune necunoscut: %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 "
@@ -3538,150 +3422,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 "Tip de acțiune necunoscut: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "vizualizare în soluție o detaliere a modificărilor"
-
-#: 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 "Comută „acțiune ^respinsă”"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Preferințe"
-#: 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 "Stare"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Examinează soluția"
-#: 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 "Selectați următoarea soluție pentru problemele de dependențe."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Examinează soluția"
+#: 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 "Executarea acțiunilor conținute de soluția selectată."
-#: 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 "Înnoire"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Pachetul sursă: "
-#: 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 "Manual"
-#: 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 "Înnoire"
-#: 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 "da"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3736,21 +3601,21 @@ msgstr "Se descarcă jurnalul de modificări"
msgid "Downloading changelogs"
msgstr "Se descarcă jurnalul de modificări"
-#: 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 de folosit la descărcarea jurnalelor de modificări"
-#: 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"
@@ -3760,19 +3625,19 @@ msgstr[0] "%d înnoire"
msgstr[1] "%d înnoiri"
msgstr[2] "%d de înnoiri"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Neinstalat"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Nu s-a putut localiza pachetul %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 "
@@ -3784,7 +3649,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'>"
@@ -3796,49 +3661,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 "Eroare internă: Șirul implicit de coloană este neanalizabil"
-#: 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 "Manevrarea dependențelor"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Manevrarea dependențelor"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Manevrarea dependențelor"
-#: 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."
@@ -4103,6 +3968,10 @@ msgstr "Reinstalare"
msgid "Downgrade"
msgstr "Retrogradare"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Ștergere"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4301,6 +4170,20 @@ msgstr "neinstalat"
msgid "Install/Upgrade"
msgstr "Instalat"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Curăță"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Ține"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Păstrare"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4366,133 +4249,133 @@ msgstr "nu"
msgid "Unknown"
msgstr "Necunoscut"
-#: 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 "Nici un pachet nu îndeplinește modelul \"%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 "Pachet: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s versiuni"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Instalare(%s furnizează %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, versiunea: %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 "Se păstrează următoarele pachete la versiunea lor curentă:"
-#: 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 "A^nularea acțiunilor în desfășurare"
-#: 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 "Se anulează ștergerea lui %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 "Se anulează ștergerea lui %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 "Se anulează ștergerea lui %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 "Se anulează instalarea lui %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 "Se anulează ștergerea lui %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 "Se anulează instalarea lui %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Ștergere(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Curăță"
-#: 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' pentru a marca pachetele ca fiind automat instalate"
-#: 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 "Pachetul „%s” este instalat manual.\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” este un pachet virtual furnizat de:\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: "
@@ -4522,28 +4405,28 @@ msgstr "%s; va fi instalată automat"
msgid "%s is being installed manually."
msgstr "%s; va fi instalată automat"
-#: 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 "Căutare"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Se construiește vizualizarea"
-#: 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 "Se construiește vizualizarea"
-#: 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 "
@@ -4559,7 +4442,7 @@ msgstr ""
" Prezența acestei arborescențe indică faptul că ceva este deteriorat, fie în "
"sistemul dumneavoastră, fie în arhiva 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 "
@@ -4571,7 +4454,7 @@ msgstr ""
"îndeplinirea dependențelor, iar în urma acțiunii planificate nici un pachet "
"instalat nu va mai avea o dependență 'importantă' față de ele.\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 "
@@ -4581,7 +4464,7 @@ msgstr ""
" Aceste pachete ar putea fi înnoite, dar sunt ținute în starea curentă "
"pentru a evita deteriorarea dependențelor."
-#: 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 "
@@ -4591,7 +4474,7 @@ msgstr ""
" Aceste pachete sunt instalate deoarece sunt cerute de alte pachete pe care "
"le-ați ales pentru instalare."
-#: 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 "
@@ -4602,7 +4485,7 @@ msgstr ""
"nu mai sunt disponibile, sau pentru că alt pachet este în conflict cu "
"acestea."
-#: 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 "
@@ -4612,7 +4495,7 @@ msgstr ""
" Se va instala o versiune mai veche a acestor pachete decât cea care este în "
"momentul de față instalată."
-#: 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 "
@@ -4622,7 +4505,7 @@ msgstr ""
" Aceste pachete ar putea fi înnoite, dat ați cerut să fie ținute la "
"versiunea lor actuală."
-#: 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."
@@ -4630,7 +4513,7 @@ msgstr ""
"Pachete de reinstalat\n"
" Aceste pachete vor fi reinstalate."
-#: 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 "
@@ -4639,7 +4522,7 @@ msgstr ""
"Pachete de instalat\n"
" Aceste pachete au fost selectate manual pentru instalare."
-#: 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."
@@ -4647,7 +4530,7 @@ msgstr ""
"Pachete de șters\n"
" Aceste pachete au fost selectate manual pentru ștergere."
-#: 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."
@@ -4655,7 +4538,7 @@ msgstr ""
"Pachete de înnoit\n"
" Aceste pachete vor fi înnoite la o versiune mai nouă."
-#: 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 "
@@ -4665,7 +4548,7 @@ msgstr ""
" Aceste pachete nu sunt complet instalate și configurate; se va încerca "
"terminarea instalării lor."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4686,119 +4569,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 "Pachet"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Neinstalat"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Se șterge %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 "Se anulează instalarea lui %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 "Se anulează ștergerea lui %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 "Se păstrează %F la versiunea %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 "Instalare(%s furnizează %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, versiunea: %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 versiuni"
-#: 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."
@@ -4809,7 +4698,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 ""
@@ -4818,192 +4707,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 depinde de %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 pre-depinde de %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 sugerează %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 recomandă %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 este în conflict cu %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 îl deteriorează pe %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 îl înlocuiește pe %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 îl învechește pe %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 "Se șterg următoarele pachete:"
-#: 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 "Se instalează următoarele pachete:"
-#: 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 "Se șterg următoarele pachete:"
-#: 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 "Se înnoiesc următoarele pachete:"
-#: 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 "Se retrogradează următoarele pachetele:"
-#: 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 "Se lasă următoarele dependențe nesatisfăcute: %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 "Se șterge %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 "Se instalează %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 "Se anulează instalarea lui %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 "Se anulează ștergerea lui %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 "Se păstrează %F la versiunea %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 "Se înnoiește %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 "Se retrogradează %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 "Ștergere(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Ștergere(%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 "Se păstrează %F la versiunea %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 "Se păstrează %F la versiunea %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 "Se anulează instalarea lui %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Se anulează instalarea lui %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Se instalează %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 "Se instalează %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, versiunea: %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, versiunea: %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 versiuni"
-#: 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 versiuni"
-#: 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"
@@ -5013,7 +4914,7 @@ msgstr[0] "%d instalare"
msgstr[1] "%d instalări"
msgstr[2] "%d de instalări"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -5023,7 +4924,7 @@ msgstr[0] "%d ștergere"
msgstr[1] "%d ștergeri"
msgstr[2] "%d de ștergeri"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -5033,7 +4934,7 @@ msgstr[0] "%d păstrare"
msgstr[1] "%d păstrări"
msgstr[2] "%d de păstrări"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -5043,7 +4944,7 @@ msgstr[0] "%d înnoire"
msgstr[1] "%d înnoiri"
msgstr[2] "%d de înnoiri"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -5053,7 +4954,7 @@ msgstr[0] "%d retrogradare"
msgstr[1] "%d retrogradări"
msgstr[2] "%d de retrogradări"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -5062,35 +4963,35 @@ msgstr[0] "^Revizuiește recomandările"
msgstr[1] "^Revizuiește recomandările"
msgstr[2] "^Revizuiește recomandările"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Nu mai sunt soluții."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Manevrarea dependențelor"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Nu mai sunt soluții."
-#: 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 "Nu mai sunt soluții."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7939,6 +7840,76 @@ msgstr "Se descarcă jurnalul de modificări"
msgid "Download Changelog"
msgstr "Descarcă jurnalul de modificări"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Instalează/șterge pachete"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Actualizează lista de pachete"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "^Marchează ce se poate înnoi"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "Uită de ^pachetele noi"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "A^nularea acțiunilor în desfășurare"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Curăță cache-ul de pachete"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Curăță ^fișierele învechite"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Reîncarcă cache-ul de pachete"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Joacă Detectorul de mine"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Devin root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "I^eșire"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "șterge"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Manevrarea dependențelor"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "vizualizare în soluție o detaliere a modificărilor"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(pentru %s)"
diff --git a/po/ru.po b/po/ru.po
index be7223a4..814f8065 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -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)"
diff --git a/po/sk.po b/po/sk.po
index 80359da5..a4582007 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-11-25 15:45+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -629,8 +629,8 @@ msgstr "Závažná chyba pri riešení závislostí"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Riešenie závislostí"
-#: 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 "Interná chyba: neočakávané prázdne riešenie."
@@ -1697,7 +1697,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
msgstr "Chcem vyriešiť konflikty, ale riešenie konfliktov nebolo vytvorené."
#: 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 "Riešenie závislostí..."
@@ -1802,7 +1802,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Nasledujúce balíky majú nesplnené závislosti:\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>"
@@ -1938,8 +1938,8 @@ msgstr "Automaticky nainštalovaný"
msgid "no"
msgstr "nie"
-#: 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 "Verzia: "
@@ -2018,12 +2018,12 @@ msgid "Obsoletes"
msgstr "Zastaráva"
#: 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 "Poskytuje"
#: 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 "Popis: "
@@ -2181,8 +2181,7 @@ msgstr "Aktuálne"
msgid "Candidate"
msgstr "Kandidát"
-#: 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 "Inštalovať"
@@ -2323,7 +2322,7 @@ msgstr "NESPLNENÝ"
msgid "UNAVAILABLE"
msgstr "NEDOSTUPNÝ"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Značky"
@@ -2597,54 +2596,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 "Sekcia"
-#: 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 "Zrušiť čakajúce operácie"
-#: 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 "„-“ na odstránenie balíkov"
-#: 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 "nie je skutočný balík"
-#: 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 "Odstrániť nasledujúce balíky:"
-#: 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 "
@@ -3096,94 +3095,44 @@ msgstr ""
msgid "_File"
msgstr "_Súbor"
-#: 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 "Vykoná všetky nevykonané inštalácie a odstraňovania"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "_Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "_Inštalovať/odstrániť balíky"
-
-#: 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 "Zistí, či nie sú k dispozícii novšie verzie balíkov"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "_Update package list"
-msgid "_Update Package List"
-msgstr "_Aktualizovať zoznam balíkov"
-
-#: 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 "Označí všetky aktualizovateľné balíky, ktoré nie sú ponechané"
-#: src/gtk/aptitude.glade:64
-msgid "Mark Up_gradable"
-msgstr "Označiť A_ktualizovateľné"
-
-#: 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 "Zabudne, ktoré balíky sú „nové“"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "_Forget new packages"
-msgid "_Forget New Packages"
-msgstr "_Zabudnúť nové balíky"
-
-#: 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 ""
"Zruší všetky čakajúce inštalácie, odstránenia, ponechania a aktualizácie."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc_el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "_Zrušiť čakajúce operácie"
-
-#: 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 "Odstráni stiahnuté súbory (balíky) z /var/cache/apt"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "_Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Vyčistiť _cache s balíkmi"
-
-#: 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 "Odstráni súbory, ktoré sa už nedajú stiahnuť"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean _obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Vyčistiť staré súb_ory"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Znovu načítať obsah cache"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "_Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "_Znovu načítať cache"
-
-#: 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 "Využiť čas hľadaním mín."
-#: src/gtk/aptitude.glade:160
-msgid "_Play Minesweeper"
-msgstr "Zahrať si mínové _pole"
-
-#: 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"
@@ -3191,237 +3140,178 @@ msgstr ""
"Na používateľa root sa môžete prepnúť spustením „su“; týmto reštartujete "
"program, ale vaše nastavenia sa zachovajú"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "_Become root"
-msgid "_Become Root"
-msgstr "_Stať sa rootom"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Ukončí program"
-#: src/gtk/aptitude.glade:195
-msgid "_Quit"
-msgstr "_Ukončiť"
-
-#: src/gtk/aptitude.glade:212
+#: src/gtk/aptitude.glade:147
msgid "E_dit"
msgstr "_Upraviť"
-#: 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 "Vráti späť poslednú operáciu alebo skupinu operácií s balíkmi"
-#: src/gtk/aptitude.glade:221
-#, fuzzy
-#| msgid "gtk-find"
-msgid "gtk-undo"
-msgstr "gtk-find"
-
-#: src/gtk/aptitude.glade:234
-msgid "gtk-cut"
-msgstr "gtk-cut"
-
-#: src/gtk/aptitude.glade:242
-msgid "gtk-copy"
-msgstr "gtk-copy"
-
-#: src/gtk/aptitude.glade:250
-msgid "gtk-paste"
-msgstr "gtk-paste"
-
-#: src/gtk/aptitude.glade:258
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
msgid "_Package"
msgstr "_Balík"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "_Views"
msgid "_View"
msgstr "_Pohľady"
-#: 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 "Zobraziť chyby, ktoré sa vystytli v systéme apt od spustenia programu."
-#: src/gtk/aptitude.glade:311
-#, fuzzy
-#| msgid "View apt _errors"
-msgid "View Apt _Errors"
-msgstr "Zobraziť _chyby apt"
-
-#: src/gtk/aptitude.glade:325
+#: src/gtk/aptitude.glade:249
msgid "Find chains of dependencies linking one package to another."
msgstr "Nájsť reťazce závislostí spájajúcich balíky."
-#: src/gtk/aptitude.glade:326
-msgid "Find _Dependency Chains"
-msgstr "Správa _závislostí"
-
-#: src/gtk/aptitude.glade:345
-msgid "gtk-go-back"
-msgstr "gtk-go-back"
-
-#: src/gtk/aptitude.glade:355
-msgid "gtk-go-forward"
-msgstr "gtk-go-forward"
-
-#: src/gtk/aptitude.glade:365 src/gtk/aptitude.glade:765
-#, fuzzy
-#| msgid "gtk-copy"
-msgid "gtk-close"
-msgstr "gtk-copy"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
msgid "_Help"
msgstr "_Pomoc"
-#: src/gtk/aptitude.glade:387
-msgid "gtk-about"
-msgstr "gtk-about"
-
-#: 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 "Palubná doska"
-#: src/gtk/aptitude.glade:422
+#: src/gtk/aptitude.glade:344
msgid "Update"
msgstr "_Aktualizovať zoznam"
-#: 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 "Balíky"
-#: 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 "Náhľad"
-#: 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 "Odstraňovač"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
msgid "Install/Remove"
msgstr "Nainštalovať/odstrániť"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Odstrániť"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-msgid "Purge"
-msgstr "Vyčistiť"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Zachovať"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Ponechať"
-
-#: 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 "Odstráni filter aplikovaný na zoznam balíkov"
-#: 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 "Na zoznam balíkov aplikuje výberový filter"
-#: 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 "gtk-copy"
+msgid "gtk-close"
+msgstr "gtk-copy"
+
+#: src/gtk/aptitude.glade:719 src/gtk/aptitude.glade:1425
+#: src/gtk/aptitude.glade:1754 src/gtk/aptitude.glade:1892
msgid "Search:"
msgstr "Hľadať:"
-#: 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 "gtk-find"
-#: src/gtk/aptitude.glade:845
+#: src/gtk/aptitude.glade:750
#, fuzzy
#| msgid "reinstall"
msgid "Incremental"
msgstr "reinštalovať"
-#: 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
msgid "Errors"
msgstr "chyby"
-#: 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 "<span size=\"xx-large\">Verzie:</span>"
-#: src/gtk/aptitude.glade:1046
+#: src/gtk/aptitude.glade:956
msgid "Dependencies"
msgstr "Závislosti"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
msgid "Changelog"
msgstr "Záznam zmien"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
msgid "Files"
msgstr "Súbory"
-#: src/gtk/aptitude.glade:1115
+#: src/gtk/aptitude.glade:1025
msgid "popcon"
msgstr "súťaž popularity"
-#: src/gtk/aptitude.glade:1124
+#: src/gtk/aptitude.glade:1034
msgid "Popcon"
msgstr "Súťaž popularity"
-#: src/gtk/aptitude.glade:1135
+#: src/gtk/aptitude.glade:1045
msgid "tags"
msgstr "značky"
-#: 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
+msgid "Status"
+msgstr "stav"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Neznáma operácia: %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 "
@@ -3430,144 +3320,127 @@ 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 "Neznáma operácia: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "zobraziť vysvetlenie zmien v riešení"
-
-#: 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 "Prepnúť ^Zamietnuté"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Nastavenia"
-#: 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
-msgid "Status"
-msgstr "stav"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#: src/gtk/aptitude.glade:1369
+#, fuzzy
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Vyskúšať Riešenie"
-#: 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 "Zvolí ďalšie riešenie problémov so závislosťami."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Vyskúšať Riešenie"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
+msgstr "gtk-apply"
-#: 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 "Vykoná operácie, ktoré sú zahrnuté v aktuálne zvolenom riešení."
-#: src/gtk/aptitude.glade:1458
-msgid "gtk-apply"
-msgstr "gtk-apply"
-
-#: src/gtk/aptitude.glade:1607
+#: src/gtk/aptitude.glade:1543
msgid "Upgrade Summary"
msgstr "Zhrnutie aktualizácie"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
msgid "Selected Package"
msgstr "Vybraný balík:"
-#: 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 "Manuálne"
-#: 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 "Aktualizovať"
-#: src/gtk/aptitude.glade:1718
+#: src/gtk/aptitude.glade:1663
msgid "<b>Available Upgrades:</b>"
msgstr "<b>Dostupné aktualizácie:</b>"
-#: src/gtk/aptitude.glade:1911
+#: src/gtk/aptitude.glade:1858
msgid "<b>Start at these packages:</b>"
msgstr "<b>Začať u týchto balíkov:</b>"
-#: src/gtk/aptitude.glade:2047
+#: src/gtk/aptitude.glade:1996
msgid "<b>End at these packages:</b>"
msgstr "<b>Skončiť u týchto balíkov:</b>"
-#: src/gtk/aptitude.glade:2115
+#: src/gtk/aptitude.glade:2064
msgid "A terminal running dpkg will appear here."
msgstr "Tu sa objaví terminál, na ktorom beží dpkg."
-#: 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 "gtk-copy"
msgid "gtk-yes"
msgstr "gtk-copy"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
#, fuzzy
#| msgid "gtk-copy"
msgid "gtk-no"
@@ -3622,19 +3495,19 @@ msgstr "Sťahuje sa záznam zmien (changelog), čakajte prosím..."
msgid "Downloading changelogs"
msgstr "Sťahujú sa záznamy zmien"
-#: 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
msgid "Preparing to download changelogs"
msgstr "Pripravuje sa sťahovanie záznamov zmien"
-#: src/gtk/dashboardtab.cc:396
+#: src/gtk/dashboardtab.cc:397
msgid "Available upgrades:"
msgstr "Dostupné aktualizácie:"
-#: src/gtk/dashboardtab.cc:413
+#: src/gtk/dashboardtab.cc:414
#, c-format
msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
@@ -3642,19 +3515,19 @@ msgstr[0] "Dostupná %d aktualizácia:"
msgstr[1] "Dostupné %d aktualizácie:"
msgstr[2] "Dostupných %d aktualizácií:"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not available"
msgid "No upgrades are available."
msgstr "Nedostupný"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Nedá sa nájsť balík %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 "
@@ -3666,7 +3539,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'>"
@@ -3678,51 +3551,51 @@ 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 "Vnútorná chyba: Štandardný reťazec stĺpca sa nedá spracovať"
-#: 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 "Find _Dependency Chains"
msgid "Find dependency chains: start"
msgstr "Správa _závislostí"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Find _Dependency Chains"
msgid "Find dependency chains: end"
msgstr "Správa _závislostí"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Find _Dependency Chains"
msgid "Find dependency chains: results"
msgstr "Správa _závislostí"
-#: 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 ""
"Vyberte jeden alebo viac balíkov od ktorého začne a balík pri ktorom skončí "
"hľadanie."
-#: src/gtk/dependency_chains_tab.cc:276
+#: src/gtk/dependency_chains_tab.cc:281
msgid "No dependency chain found."
msgstr "Nebol nájdený žiadny reťazec závislostí."
@@ -3951,6 +3824,10 @@ msgstr "Reinštalovať"
msgid "Downgrade"
msgstr "Degradovať"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Odstrániť"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr "Odstrániť a vyčistiť konfiguráciu/dáta"
@@ -4127,6 +4004,18 @@ msgstr "Hotovo"
msgid "Install/Upgrade"
msgstr "Nainštalovaný"
+#: src/gtk/gui.cc:1377
+msgid "Purge"
+msgstr "Vyčistiť"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Zachovať"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Ponechať"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4188,116 +4077,116 @@ msgstr "info"
msgid "Unknown"
msgstr "Neznáma"
-#: src/gtk/packagestab.cc:60
+#: src/gtk/packagestab.cc:61
msgid "Parse error"
msgstr ""
-#: src/gtk/packagestab.cc:203
+#: src/gtk/packagestab.cc:204
#, c-format
msgid "No packages matched \"%s\"."
msgstr "Žiadne balíky nevyhovujú vzoru „%s“."
-#: src/gtk/packagestab.cc:313
+#: src/gtk/packagestab.cc:314
msgid "Enter a search and click \"Find\" to display packages."
msgstr "Zadajte vyhľadávací reťazec a kliknite „Nájsť“, zobrazia sa balíky."
-#: src/gtk/packagestab.cc:413
+#: src/gtk/packagestab.cc:416
msgid "Packages: "
msgstr "Balíky: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, c-format
msgid "Upgrade to %s version %s"
msgstr "Aktualizovať na %s verzie %s"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, c-format
msgid "Install %s version %s"
msgstr "Nainštalovať %s verzie %s"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, c-format
msgid "Downgrade to %s version %s"
msgstr "Znížiť %s na verziu %s"
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, c-format
msgid "Don't hold %s at its current version."
msgstr "Neponechávať %s na jeho aktuálnej verzii."
-#: 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
#, c-format
msgid "Cancel any actions on %s."
msgstr "Zrušiť všetky operácie na %s."
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, c-format
msgid "Cancel the purge of %s."
msgstr "Zrušiť vyčistenie %s."
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, c-format
msgid "Cancel the removal of %s."
msgstr "Zrušiť odstránenie %s."
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, c-format
msgid "Cancel the upgrade of %s."
msgstr "Zrušiť aktualizáciu %s."
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, c-format
msgid "Cancel the installation of %s."
msgstr "Zrušiť inštaláciu %s."
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, c-format
msgid "Cancel the downgrade of %s."
msgstr "Zrušiť zníženie verzie %s."
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, c-format
msgid "Cancel the reinstallation of %s."
msgstr "Zrušiť reinštaláciu %s."
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, c-format
msgid "Remove %s"
msgstr "Odstrániť %s"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, c-format
msgid "Purge %s"
msgstr "Vyčistiť %s"
-#: src/gtk/packagestab.cc:591
+#: src/gtk/packagestab.cc:594
#, c-format
msgid "Hold %s at its current version."
msgstr "Podržať %s v jeho aktuálnej verzii."
-#: 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“ na označenie balíkov ako automatiky inštalovaných"
-#: 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 "Balík „%s“ je nainštalovaný manuálne.\n"
-#: src/gtk/packagestab.cc:643
+#: src/gtk/packagestab.cc:646
#, c-format
msgid "%s is a virtual package provided by:\n"
msgstr "%s je virtuálny balík; poskytuje ho:\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 "(podrobnosti...)"
-#: src/gtk/packagestab.cc:736
+#: src/gtk/packagestab.cc:739
#, fuzzy
#| msgid "Source Package: "
msgid "Source: "
@@ -4327,26 +4216,26 @@ msgstr "%s; sa automaticky nainštaluje"
msgid "%s is being installed manually."
msgstr "%s; sa automaticky nainštaluje"
-#: src/gtk/pkgview.cc:399
+#: src/gtk/pkgview.cc:401
msgid "Cache reloading, please wait..."
msgstr "Obnovuje sa vyrovnávacia pamäť, čakajte prosím..."
-#: src/gtk/pkgview.cc:604
+#: src/gtk/pkgview.cc:607
#, fuzzy
#| msgid "Search"
msgid "Searching..."
msgstr "Hľadať"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
msgid "Finalizing view"
msgstr "Zostavuje sa pohľad"
-#: 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 "Zostavuje sa pohľad"
-#: 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 "
@@ -4361,7 +4250,7 @@ msgstr ""
" Prítomnosť tohto stromu naznačuje, že je niečo divné vo vašom systéme alebo "
"v archíve Debianu."
-#: 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 "
@@ -4372,7 +4261,7 @@ msgstr ""
" Tieto balíky sú označené na odstránenie, pretože boli nainštalované "
"automaticky kvôli závislostiam, ktoré už nie sú potrebné.\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 "
@@ -4382,7 +4271,7 @@ msgstr ""
" Tieto balíky môžu byť aktualizované na novšiu verziu, ale sú ponechané vo "
"svojej pôvodnej verzií, aby sa neporušili závislosti."
-#: 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 "
@@ -4392,7 +4281,7 @@ msgstr ""
" Tieto balíky budú automaticky nainštalované, pretože sú vyžadované inými "
"balíkmi, ktoré ste vybrali na inštaláciu."
-#: 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 "
@@ -4402,7 +4291,7 @@ msgstr ""
" Tieto balíky budú odstránené, pretože jedna alebo viac ich závislostí už "
"nie je splnená, alebo pretože je s nimi iný balík v konflikte."
-#: 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 "
@@ -4411,7 +4300,7 @@ msgstr ""
"Balíky na degradáciu\n"
" Tieto balíky budú nahradené svojou staršou verziou."
-#: 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 "
@@ -4421,7 +4310,7 @@ msgstr ""
" Tieto balíky môžu byť aktualizované na novšiu verziu, ale vy ste požiadali "
"o ich ponechanie v pôvodnej verzii."
-#: 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."
@@ -4429,7 +4318,7 @@ msgstr ""
"Balíky k reinštalácií\n"
" Tieto balíky budú preinštalované."
-#: 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 "
@@ -4438,7 +4327,7 @@ msgstr ""
"Balíky na inštaláciu\n"
" Tieto balíky ste vybrali na inštaláciu na svoj počítač."
-#: 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."
@@ -4446,7 +4335,7 @@ msgstr ""
"Balíky na odstránenie\n"
" Tieto balíky ste vybrali na odstránenie zo systému."
-#: 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."
@@ -4454,7 +4343,7 @@ msgstr ""
"Balíky na aktualizáciu\n"
" Tieto balíky budú aktualizované na novšiu verziu."
-#: 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 "
@@ -4464,7 +4353,7 @@ msgstr ""
" Tieto balíky nie sú plne nainštalované a nakonfigurované; vykoná sa pokus o "
"dokončenie inštalácie."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
msgid "Preview: "
msgstr "Náhľad:"
@@ -4486,119 +4375,125 @@ msgstr ""
"\n"
"%s"
-#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275
+#: src/gtk/resolver.cc:207
+#, fuzzy
+#| msgid "Package"
+msgid "Virtual package"
+msgstr "Balík"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Nenainštalovaný"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Odstraňuje sa %s"
-#: src/gtk/resolver.cc:337
+#: src/gtk/resolver.cc:377
#, fuzzy, c-format
#| msgid "Cancel the installation of %s."
msgid "Canceling the installation of %s is rejected."
msgstr "Zrušiť inštaláciu %s."
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, fuzzy, c-format
#| msgid "Cancel the removal of %s."
msgid "Canceling the removal of %s is rejected."
msgstr "Zrušiť odstránenie %s."
-#: 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 "Ponechať %F vo verzii %s (%s)"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
#| msgid "Install %s version %s"
msgid "Installing %s version %s is rejected."
msgstr "Nainštalovať %s verzie %s"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
#| msgid "Downgrade to %s version %s"
msgid "Downgrading %s to version %s is rejected."
msgstr "Znížiť %s na verziu %s"
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, fuzzy, c-format
#| msgid "Upgrade to %s version %s"
msgid "Upgrading %s to version %s is rejected."
msgstr "Aktualizovať na %s verzie %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."
@@ -4609,7 +4504,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 ""
@@ -4618,188 +4513,200 @@ 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 závisí na %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 pred-závisí na %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 navrhuje %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 doporučuje %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 koliduje 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 kazí %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 nahrádza %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 zastaráva %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 "Odstrániť nasledujúce balíky:"
-#: 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 "Nainštalovať nasledujúce balíky:"
-#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781
+#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848
msgid "Keep the following packages:"
msgstr "Ponechať nasledujúce balíky:"
-#: 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 "Aktualizovať nasledujúce balíky:"
-#: 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 "Znížiť verzie nasledujúcich balíkov:"
-#: src/gtk/resolver.cc:1369 src/gtk/resolver.cc:1819
+#: src/gtk/resolver.cc:1425 src/gtk/resolver.cc:1886
msgid "Leave the following dependencies unresolved:"
msgstr "Ponechať nasledujúce závislosti nevyriešené:"
-#: 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 "Odstránenie %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 "Inštalácia %F [%s (%s)]"
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, fuzzy, c-format
#| msgid "Cancel the installation of %s."
msgid "Cancel the installation of %s"
msgstr "Zrušiť inštaláciu %s."
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, fuzzy, c-format
#| msgid "Cancel the removal of %s."
msgid "Cancel the removal of %s"
msgstr "Zrušiť odstránenie %s."
-#: 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 "Ponechať %F vo verzii %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 "Aktualizovať %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 "Znížiť verziu %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 "Odstrániť %s"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove %s"
msgid "<b>remove</b> %s"
msgstr "Odstrániť %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 "Ponechať %F vo verzii %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 "Ponechať %F vo verzii %s (%s)"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %s."
+msgid "<b>Cancel</b> the installation of %s"
+msgstr "Zrušiť inštaláciu %s."
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %s."
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Zrušiť inštaláciu %s."
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Inštalácia %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 "Inštalácia %F [%s (%s)]"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
#| msgid "Downgrade to %s version %s"
msgid "<b>Downgrade</b> %s to version %s"
msgstr "Znížiť %s na verziu %s"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
#| msgid "Downgrade to %s version %s"
msgid "<b>downgrade</b> %s to version %s"
msgstr "Znížiť %s na verziu %s"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, fuzzy, c-format
#| msgid "Upgrade to %s version %s"
msgid "<b>Upgrade</b> %s to version %s"
msgstr "Aktualizovať na %s verzie %s"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, fuzzy, c-format
#| msgid "Upgrade to %s version %s"
msgid "<b>upgrade</b> %s to version %s"
msgstr "Aktualizovať na %s verzie %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"
@@ -4809,7 +4716,7 @@ msgstr[0] "%d inštalovaný"
msgstr[1] "%d inštalované"
msgstr[2] "%d inštalovaných"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4819,7 +4726,7 @@ msgstr[0] "%d odstránenie"
msgstr[1] "%d odstránenia"
msgstr[2] "%d odstránení"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4829,7 +4736,7 @@ msgstr[0] "%d ponechanie"
msgstr[1] "%d ponechania"
msgstr[2] "%d ponechaní"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4839,7 +4746,7 @@ msgstr[0] "%d aktualizácia"
msgstr[1] "%d aktualizácie"
msgstr[2] "%d aktualizácií"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4849,7 +4756,7 @@ msgstr[0] "%d degradovaný"
msgstr[1] "%d degradované"
msgstr[2] "%d degradovaných"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4858,31 +4765,31 @@ msgstr[0] "Audit ^Odporúčaní"
msgstr[1] "Audit ^Odporúčaní"
msgstr[2] "Audit ^Odporúčaní"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
msgid "No solutions yet."
msgstr "Zatiaľ žiadne riešenia."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "No dependency chain found."
msgid "No dependency solution was found."
msgstr "Nebol nájdený žiadny reťazec závislostí."
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
msgid "No solutions."
msgstr "Žiadne riešenia."
-#: 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 solutions."
msgid "%u solutions."
msgstr "Žiadne riešenia."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, fuzzy, c-format
#| msgid "Solution %d of %d (score: %d)"
msgid "Solution %s of %s (tier %s)."
@@ -7672,6 +7579,94 @@ msgstr "Sťahuje sa záznam zmien (changelog)"
msgid "Download Changelog"
msgstr "Stiahnuť Changelog"
+#, fuzzy
+#~| msgid "_Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "_Inštalovať/odstrániť balíky"
+
+#, fuzzy
+#~| msgid "_Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "_Aktualizovať zoznam balíkov"
+
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Označiť A_ktualizovateľné"
+
+#, fuzzy
+#~| msgid "_Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "_Zabudnúť nové balíky"
+
+#, fuzzy
+#~| msgid "Canc_el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "_Zrušiť čakajúce operácie"
+
+#, fuzzy
+#~| msgid "_Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Vyčistiť _cache s balíkmi"
+
+#, fuzzy
+#~| msgid "Clean _obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Vyčistiť staré súb_ory"
+
+#, fuzzy
+#~| msgid "_Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "_Znovu načítať cache"
+
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Zahrať si mínové _pole"
+
+#, fuzzy
+#~| msgid "_Become root"
+#~ msgid "_Become Root"
+#~ msgstr "_Stať sa rootom"
+
+#~ msgid "_Quit"
+#~ msgstr "_Ukončiť"
+
+#, fuzzy
+#~| msgid "gtk-find"
+#~ msgid "gtk-undo"
+#~ msgstr "gtk-find"
+
+#~ msgid "gtk-cut"
+#~ msgstr "gtk-cut"
+
+#~ msgid "gtk-copy"
+#~ msgstr "gtk-copy"
+
+#~ msgid "gtk-paste"
+#~ msgstr "gtk-paste"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#, fuzzy
+#~| msgid "View apt _errors"
+#~ msgid "View Apt _Errors"
+#~ msgstr "Zobraziť _chyby apt"
+
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Správa _závislostí"
+
+#~ msgid "gtk-go-back"
+#~ msgstr "gtk-go-back"
+
+#~ msgid "gtk-go-forward"
+#~ msgstr "gtk-go-forward"
+
+#~ msgid "gtk-about"
+#~ msgstr "gtk-about"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "zobraziť vysvetlenie zmien v riešení"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(pre %s)"
diff --git a/po/sv.po b/po/sv.po
index 1a2f9b04..82a48a2e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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: 2009-02-03 15:46+0100\n"
"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -645,8 +645,8 @@ msgstr "Ödesdigert fel i problemlösaren"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Löser bereoenden"
-#: 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 "Internt fel: oväntad noll-lösning."
@@ -1716,7 +1716,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
msgstr "Jag vill lösa beroendekonflikter men det finns ingen beroendelösare."
#: 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 "Löser beroenden..."
@@ -1819,7 +1819,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Följande paket har otillfredsställda beroenden:\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 "<NOLL>"
@@ -1955,8 +1955,8 @@ msgstr "Automatiskt installerade"
msgid "no"
msgstr "nej"
-#: 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 "Version: "
@@ -2035,12 +2035,12 @@ msgid "Obsoletes"
msgstr "Föråldrar"
#: 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 "Tillhandahåller"
#: 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 "Beskrivning: "
@@ -2196,8 +2196,7 @@ msgstr "Aktuell"
msgid "Candidate"
msgstr "Kandidat"
-#: 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 "Installera"
@@ -2340,7 +2339,7 @@ msgstr "OTILLFREDSSTÄLLT"
msgid "UNAVAILABLE"
msgstr "OTILLGÄNGLIGT"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Taggar"
@@ -2611,54 +2610,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 "Sektion"
-#: 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 "Avbry^t väntande åtgärder"
-#: 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 "\"-\" för att ta bort paket"
-#: 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 "inte ett riktigt paket"
-#: 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 "Ta bort följande paket:"
-#: 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 "
@@ -3115,100 +3114,46 @@ msgstr ""
msgid "_File"
msgstr "Falskt"
-#: 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 "Genomför alla väntande installationer och borttagningar"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Installera/Ta bort paket"
-
-#: 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 "Leta efter nya versioner av paket"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Uppdatera paketlista"
-
-#: 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 ""
"Markera alla uppgraderingsbara paket som inte hålls kvar för uppgradering"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Markera upp^graderingsbar"
-
-#: 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 "Glöm vilka paket som är \"nya\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Glöm nya paket"
-
-#: 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 ""
"Avbryt alla väntande installationer, borttagningar, tillbakahållningar och "
"uppgraderingar."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Avbry^t väntande åtgärder"
-
-#: 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 "Ta bort paketfiler som tidigare har hämtats"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Rensa paketcachen"
-
-#: 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 "Ta bort paketfiler som inte längre kan hämtas"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Rensa föråldra^de filer"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Läs om paketcachen"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Läs om paketcache"
-
-#: 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 "Slösa bort tid med att leta minor"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Spela Minröj"
-
-#: 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"
@@ -3216,261 +3161,200 @@ msgstr ""
"Kör \"su\" för att bli root, detta kommer att starta om programmet men dina "
"inställningar kommer att bevaras"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Bli root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Avsluta programmet"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "A^vsluta"
-
-#: 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 "Ångra den senaste paketåtgärden eller gruppoperationer"
-#: 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 "radera"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paket"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Vyer"
-#: 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 "Beroendehantering"
-
-#: 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 "radera"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Hjälp"
-#: 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 "Listuppdatering"
-#: 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 "Paket"
-#: 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 "Förhandsvisning"
-#: 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 "Problemlösaren"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Installerat"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Ta bort"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Rensa"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Behåll"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Håll kvar"
-
-#: 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 "Ta bort filtret från paketlistan"
-#: 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 "Aktivera ett filter på paketlistan"
-#: 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 "radera"
+
+#: 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 "Sök"
-#: 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 "installera om"
-#: 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 "Fel"
-#: 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 "Beroenden för %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Ändringslogg"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Falskt"
-#: 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 "Taggar"
-#: 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 "Tillstånd"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Okänd åtgärdstyp: %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 "
@@ -3479,150 +3363,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 "Okänd åtgärdstyp: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "visa en förklaring för ändringarna i lösningen"
-
-#: 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 "Växla väg^rad"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Egenskaper"
-#: 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 "Tillstånd"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "Und^ersök lösning"
-#: 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 "Välj nästa lösning till beroendeproblemen."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "Und^ersök lösning"
+#: 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 "Genomför åtgärderna som nuvarande lösning innebär."
-#: 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 "Uppgradera"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Källpaket: "
-#: 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 "Handbok"
-#: 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 "Uppgradera"
-#: 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 "ja"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3675,21 +3540,21 @@ msgstr "Hämtar ändringslogg"
msgid "Downloading changelogs"
msgstr "Hämtar ändringslogg"
-#: 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 att använda för att hämta ändringsloggar"
-#: 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"
@@ -3698,19 +3563,19 @@ msgid_plural "%d available upgrades:"
msgstr[0] "%d att uppgradera"
msgstr[1] "%d att uppgradera"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Inte installerat"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Kunde inte hitta paketet %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 "
@@ -3721,7 +3586,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3732,49 +3597,49 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Internt fel: Standardkolumnsträng är inte tolkningsbar"
-#: 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 "Beroendehantering"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Beroendehantering"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Beroendehantering"
-#: 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."
@@ -4039,6 +3904,10 @@ msgstr "Installera om"
msgid "Downgrade"
msgstr "Nedgradera"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Ta bort"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4235,6 +4104,20 @@ msgstr "inte installerat"
msgid "Install/Upgrade"
msgstr "Installerat"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Rensa"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Behåll"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Håll kvar"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4300,132 +4183,132 @@ msgstr "nej"
msgid "Unknown"
msgstr "Okänd"
-#: 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 "Inga paket matchade mönstret \"%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 "Paket: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s versioner"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Install(%s provides %s)"
msgid "Install %s version %s"
msgstr "Installera (%s tillhandahåller %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-version: %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 "Behåll följande paket vid deras nuvarande version:"
-#: 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 "Avbry^t väntande åtgärder"
-#: 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 "Avbryt borttagningen av %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 "Avbryt borttagningen av %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 "Avbryt borttagningen av %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 "Avbryt installationen av %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 "Avbryt borttagningen av %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 "Avbryt installationen av %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Ta bort (%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Rensa"
-#: 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\" för att markera paket som automatiskt installerade"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr "\"&m\" för att markera paket som manuellt installerade"
-#: 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\" är ett virtuellt paket som tillhandahålls av:\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: "
@@ -4455,28 +4338,28 @@ msgstr "%s; kommer att installeras automatiskt"
msgid "%s is being installed manually."
msgstr "%s; kommer att installeras automatiskt"
-#: 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 "Sök"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Bygger vy"
-#: 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 "Bygger vy"
-#: 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 "
@@ -4492,7 +4375,7 @@ msgstr ""
" Skälet för att detta träd finns här nu indikerar att någonting är trasigt, "
"antingen på ditt system eller i Debian-arkivet."
-#: 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 "
@@ -4504,7 +4387,7 @@ msgstr ""
"för att uppfylla beroenden och den planerade åtgärden kommer att visa att "
"inga installerade paket tillkännager ett \"important\"-beroende för dom.\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 "
@@ -4514,7 +4397,7 @@ msgstr ""
" Dessa paket kan uppgraderas men de har hållits tillbaka i sitt nuvarande "
"tillstånd för att undvika att bryta beroenden."
-#: 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 "
@@ -4525,7 +4408,7 @@ msgstr ""
" Dessa paket kommer att installeras för att de krävs av andra paket som du "
"har valt att installera."
-#: 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 "
@@ -4535,7 +4418,7 @@ msgstr ""
" Dessa paket kommer att tas bort för att ett eller flera av deras beroenden "
"inte längre är tillgängliga eller för att andra paket är i konflikt med dem."
-#: 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 "
@@ -4545,7 +4428,7 @@ msgstr ""
" En äldre version av dessa paket som är installerade för närvarande kommer "
"att installeras."
-#: 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 "
@@ -4555,7 +4438,7 @@ msgstr ""
" Dessa paket kan uppgraderas men du har valt att hålla dem kvar i sina "
"nuvarande version."
-#: 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."
@@ -4563,7 +4446,7 @@ msgstr ""
"Paket som kommer att installeras om\n"
" Dessa paket kommer att installeras om."
-#: 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 "
@@ -4572,7 +4455,7 @@ msgstr ""
"Paket som kommer att installeras\n"
" Dessa paket har manuellt blivit valda för installation på din dator."
-#: 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."
@@ -4580,7 +4463,7 @@ msgstr ""
"Paket som kommer att tas bort\n"
" Dessa paket har blivit manuellt valda för borttagning."
-#: 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."
@@ -4588,7 +4471,7 @@ msgstr ""
"Paket som kommer att uppgraderas\n"
" Dessa paket kommer att uppgraderas till en nyare version."
-#: 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 "
@@ -4598,7 +4481,7 @@ msgstr ""
" Dessa paket är inte helt installerade och konfigurerade; ett försök kommer "
"att göras för att installera dem helt."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4619,117 +4502,123 @@ 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 "Paket"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Inte installerat"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Tar bort %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 "Avbryt installationen av %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 "Avbryt borttagningen av %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 "Håll kvar %F vid version %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 "Installera (%s tillhandahåller %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-version: %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 versioner"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4739,7 +4628,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4747,192 +4636,204 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 är beroende av %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 är förberoende av %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 föreslår %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 rekommenderar %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 står i konflikt med %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 gör %s oanvändbar"
-#: 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 ersätter %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 föråldrar %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 "Ta bort följande paket:"
-#: 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 "Installera följande paket:"
-#: 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 "Ta bort följande paket:"
-#: 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 "Uppgradera följande paket:"
-#: 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 "Nedgradera följande paket:"
-#: 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 "Lämna följande beroenden olösta:%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 "Ta bort %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 "Installera %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 "Avbryt installationen av %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 "Avbryt borttagningen av %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 "Håll kvar %F vid version %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 "Uppgradera %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 "Nedgradera %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 "Ta bort (%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Ta bort (%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 "Håll kvar %F vid version %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 "Håll kvar %F vid version %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 "Avbryt installationen av %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Avbryt installationen av %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Installera %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 "Installera %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-version: %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-version: %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 versioner"
-#: 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 versioner"
-#: 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"
@@ -4941,7 +4842,7 @@ msgid_plural "%s installs"
msgstr[0] "%d att installera"
msgstr[1] "%d att installera"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4950,7 +4851,7 @@ msgid_plural "%s removes"
msgstr[0] "%d att ta bort"
msgstr[1] "%d att ta bort"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4959,7 +4860,7 @@ msgid_plural "%s keeps"
msgstr[0] "%d att behålla"
msgstr[1] "%d att behålla"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4968,7 +4869,7 @@ msgid_plural "%s upgrades"
msgstr[0] "%d att uppgradera"
msgstr[1] "%d att uppgradera"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4977,7 +4878,7 @@ msgid_plural "%s downgrades"
msgstr[0] "%d att nedgradera"
msgstr[1] "%d att nedgradera"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
@@ -4985,35 +4886,35 @@ msgid_plural "%s unresolved recommendations"
msgstr[0] "Granska ^rekommendationer"
msgstr[1] "Granska ^rekommendationer"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Inga fler lösningar."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Beroendehantering"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Inga fler lösningar."
-#: 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 "Inga fler lösningar."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7829,6 +7730,76 @@ msgstr "Hämtar ändringslogg"
msgid "Download Changelog"
msgstr "Hämta ändringslogg"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Installera/Ta bort paket"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Uppdatera paketlista"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Markera upp^graderingsbar"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Glöm nya paket"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Avbry^t väntande åtgärder"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Rensa paketcachen"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Rensa föråldra^de filer"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Läs om paketcache"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Spela Minröj"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Bli root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "A^vsluta"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "radera"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Beroendehantering"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "visa en förklaring för ändringarna i lösningen"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(för %s)"
diff --git a/po/th.po b/po/th.po
index 51a95fb4..db25c4e1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\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-06 12:52+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -515,8 +515,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr ""
-#: 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 ""
@@ -1489,7 +1489,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 ""
@@ -1588,7 +1588,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr ""
#: 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 ""
@@ -1723,8 +1723,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 ""
@@ -1803,12 +1803,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 ""
@@ -1961,8 +1961,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 ""
@@ -2098,7 +2097,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 ""
@@ -2360,46 +2359,46 @@ 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
msgid "Safe actions"
msgstr ""
-#: src/generic/apt/aptitude_resolver_universe.cc:872
+#: src/generic/apt/aptitude_resolver_universe.cc:879
msgid "Cancel all user actions"
msgstr ""
-#: src/generic/apt/aptitude_resolver_universe.cc:873
+#: src/generic/apt/aptitude_resolver_universe.cc:880
#, fuzzy
#| msgid "Removing %s"
msgid "Remove packages"
msgstr "กำลังถอดถอน %s"
-#: src/generic/apt/aptitude_resolver_universe.cc:874
+#: src/generic/apt/aptitude_resolver_universe.cc:881
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
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 "
@@ -2830,305 +2829,212 @@ msgstr ""
msgid "_File"
msgstr ""
-#: 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
-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
-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
-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
-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
-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
-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 "Obsoletes"
-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
-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
-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"
msgstr ""
-#: src/gtk/aptitude.glade:180
-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
-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
-msgid "gtk-delete"
-msgstr ""
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
msgid "_Package"
msgstr ""
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
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
-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
-msgid "gtk-close"
-msgstr ""
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
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
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
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
-msgid "Purge"
-msgstr ""
-
-#: 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
msgid "Make this the default for new package lists."
msgstr ""
-#: src/gtk/aptitude.glade:747
+#: src/gtk/aptitude.glade:646
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
+msgid "gtk-close"
+msgstr ""
+
+#: src/gtk/aptitude.glade:719 src/gtk/aptitude.glade:1425
+#: src/gtk/aptitude.glade:1754 src/gtk/aptitude.glade:1892
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
msgid "Incremental"
msgstr ""
-#: 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 "Depends"
msgid "Dependencies"
msgstr "ต้องใช้"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
msgid "Changelog"
msgstr ""
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
msgid "Files"
msgstr ""
-#: 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
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
+msgid "Status"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1216
+msgid "Group by action type"
+msgstr ""
+
+#: 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 "
@@ -3137,126 +3043,113 @@ msgid ""
"This is the default view mode."
msgstr ""
-#: src/gtk/aptitude.glade:1232
-msgid "Group by action type"
+#: 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
msgid "Rejected"
msgstr ""
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
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
-msgid "Status"
-msgstr ""
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
msgstr ""
-#: src/gtk/aptitude.glade:1442
+#: src/gtk/aptitude.glade:1373
msgid "Calculate the next solution that has not yet been generated."
msgstr ""
-#: src/gtk/aptitude.glade:1443
-msgid "Find a new solution"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
msgstr ""
-#: src/gtk/aptitude.glade:1457
+#: src/gtk/aptitude.glade:1388
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
msgid "Upgrade Summary"
msgstr ""
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
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
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
msgid "gtk-yes"
msgstr ""
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3303,36 +3196,36 @@ msgstr ""
msgid "Downloading changelogs"
msgstr ""
-#: 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
msgid "Preparing to download changelogs"
msgstr ""
-#: src/gtk/dashboardtab.cc:396
+#: src/gtk/dashboardtab.cc:397
msgid "Available upgrades:"
msgstr ""
-#: src/gtk/dashboardtab.cc:413
+#: src/gtk/dashboardtab.cc:414
#, c-format
msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
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 "
@@ -3343,7 +3236,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3354,42 +3247,42 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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
#, c-format
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
msgid "Find dependency chains: start"
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
msgid "Find dependency chains: end"
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
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
msgid "No dependency chain found."
msgstr ""
@@ -3613,6 +3506,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 ""
@@ -3775,6 +3672,18 @@ msgstr "ติดตั้งซ้ำ %lu, "
msgid "Install/Upgrade"
msgstr ""
+#: src/gtk/gui.cc:1377
+msgid "Purge"
+msgstr ""
+
+#: 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 ""
@@ -3828,116 +3737,116 @@ 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
#, c-format
msgid "No packages matched \"%s\"."
msgstr ""
-#: 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
msgid "Packages: "
msgstr ""
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, c-format
msgid "Upgrade to %s version %s"
msgstr ""
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
#| msgid "Invalid operation %s"
msgid "Install %s version %s"
msgstr "ไม่รู้จักคำสั่ง %s"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, c-format
msgid "Downgrade to %s version %s"
msgstr ""
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, c-format
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
#, c-format
msgid "Cancel any actions on %s."
msgstr ""
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, c-format
msgid "Cancel the purge of %s."
msgstr ""
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, c-format
msgid "Cancel the removal of %s."
msgstr ""
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, c-format
msgid "Cancel the upgrade of %s."
msgstr ""
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, c-format
msgid "Cancel the installation of %s."
msgstr ""
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, c-format
msgid "Cancel the downgrade of %s."
msgstr ""
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, c-format
msgid "Cancel the reinstallation of %s."
msgstr ""
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Remove %s"
msgstr "กำลังถอดถอน %s"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, c-format
msgid "Purge %s"
msgstr ""
-#: 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
#, c-format
msgid "Mark %s as automatically installed."
msgstr ""
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, c-format
msgid "Mark %s as manually installed."
msgstr ""
-#: src/gtk/packagestab.cc:643
+#: src/gtk/packagestab.cc:646
#, c-format
msgid "%s is a virtual package provided by:\n"
msgstr ""
-#: 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
msgid "Source: "
msgstr ""
@@ -3961,24 +3870,24 @@ msgstr ""
msgid "%s is being installed manually."
msgstr ""
-#: 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
msgid "Searching..."
msgstr ""
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
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 "
@@ -3988,7 +3897,7 @@ msgid ""
"either on your system or in the Debian archive."
msgstr ""
-#: 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 "
@@ -3996,74 +3905,74 @@ msgid ""
"package declaring an 'important' dependency on them.\n"
msgstr ""
-#: 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 "
"state to avoid breaking dependencies."
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 "
"package you have chosen for installation."
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 "
"is no longer available, or because another package conflicts with them."
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 "
"installed."
msgstr ""
-#: 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 "
"their current version."
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."
msgstr ""
-#: 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 "
"computer."
msgstr ""
-#: 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."
msgstr ""
-#: 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."
msgstr ""
-#: 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 "
"made to complete their installation."
msgstr ""
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
msgid "Preview: "
msgstr ""
@@ -4081,113 +3990,117 @@ msgid ""
"%s"
msgstr ""
-#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275
+#: src/gtk/resolver.cc:207
+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
#, c-format
msgid "Canceling the installation of %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, c-format
msgid "Canceling the removal of %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, fuzzy, c-format
#| msgid "Fetched %sB in %s (%sB/s)\n"
msgid "Keeping %s at version %s is rejected."
msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
#| msgid "Invalid operation %s"
msgid "Installing %s version %s is rejected."
msgstr "ไม่รู้จักคำสั่ง %s"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr ""
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, c-format
msgid "Upgrading %s to version %s is rejected."
msgstr ""
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4197,7 +4110,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4205,182 +4118,192 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 "The following packages will be REMOVED:"
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
msgid "Leave the following dependencies unresolved:"
msgstr ""
-#: src/gtk/resolver.cc:1444
+#: src/gtk/resolver.cc:1502
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Remove %s [<big>%s</big> (%s)]"
msgstr "กำลังถอดถอน %s"
-#: src/gtk/resolver.cc:1451
+#: src/gtk/resolver.cc:1509
#, fuzzy, c-format
#| msgid "Invalid operation %s"
msgid "Install %s [<big>%s</big> (%s)]"
msgstr "ไม่รู้จักคำสั่ง %s"
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, c-format
msgid "Cancel the installation of %s"
msgstr ""
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, c-format
msgid "Cancel the removal of %s"
msgstr ""
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, fuzzy, c-format
#| msgid "Fetched %sB in %s (%sB/s)\n"
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
-#: src/gtk/resolver.cc:1472
+#: src/gtk/resolver.cc:1530
#, c-format
msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1481
+#: src/gtk/resolver.cc:1539
#, c-format
msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr ""
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "<b>Remove</b> %s"
msgstr "กำลังถอดถอน %s"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "<b>remove</b> %s"
msgstr "กำลังถอดถอน %s"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
#| msgid "Fetched %sB in %s (%sB/s)\n"
msgid "<b>Keep</b> %s at version %s"
msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
#| msgid "Fetched %sB in %s (%sB/s)\n"
msgid "<b>keep</b> %s at version %s"
msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, c-format
+msgid "<b>Cancel</b> the installation of %s"
+msgstr ""
+
+#: src/gtk/resolver.cc:1615
+#, c-format
+msgid "<b>cancel</b> the installation of %s"
+msgstr ""
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Invalid operation %s"
msgid "<b>Install</b> %s %s"
msgstr "ไม่รู้จักคำสั่ง %s"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Invalid operation %s"
msgid "<b>install</b> %s %s"
msgstr "ไม่รู้จักคำสั่ง %s"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>Upgrade</b> %s to version %s"
msgstr ""
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, c-format
msgid "<b>upgrade</b> %s to version %s"
msgstr ""
-#: 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 "%lu reinstalled, "
msgid "%s install"
@@ -4388,28 +4311,28 @@ msgid_plural "%s installs"
msgstr[0] "ติดตั้งซ้ำ %lu, "
msgstr[1] "ติดตั้งซ้ำ %lu, "
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, c-format
msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, c-format
msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, c-format
msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%lu downgraded, "
msgid "%s downgrade"
@@ -4417,35 +4340,35 @@ msgid_plural "%s downgrades"
msgstr[0] "ปรับรุ่นลง %lu, "
msgstr[1] "ปรับรุ่นลง %lu, "
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, c-format
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
msgid "No solutions yet."
msgstr ""
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
msgid "No dependency solution was found."
msgstr ""
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
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
#, c-format
msgid "%u solutions."
msgstr ""
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7070,3 +6993,8 @@ msgstr ""
#: src/view_changelog.cc:391
msgid "Download Changelog"
msgstr ""
+
+#, fuzzy
+#~| msgid "Obsoletes"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "ใช้แทน"
diff --git a/po/tl.po b/po/tl.po
index b907e1f3..bb6adf98 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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: 2005-03-30 16:02+0800\n"
"Last-Translator: Ryan Escarez <rescarez@gmail.com>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -539,8 +539,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Hindi ma-buksan ang %s para sulatan"
-#: 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 ""
@@ -1586,7 +1586,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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
#, fuzzy
msgid "Resolving dependencies..."
@@ -1695,7 +1695,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Ang mga sumusunod na pakete ay may kulang na dependensiya:\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 ""
@@ -1829,8 +1829,8 @@ msgstr "Kusang insalled"
msgid "no"
msgstr "hindi"
-#: 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 "Bersyon: "
@@ -1909,12 +1909,12 @@ msgid "Obsoletes"
msgstr "Obsoletes"
#: 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 "Provides"
#: 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 "Diskripyson: "
@@ -2071,8 +2071,7 @@ msgstr ""
msgid "Candidate"
msgstr "CandVer"
-#: 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
#, fuzzy
msgid "Install"
msgstr "^Instal"
@@ -2213,7 +2212,7 @@ msgstr "HINDI KUNTENTO"
msgid "UNAVAILABLE"
msgstr "HINDI AVAILABLE"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
#, fuzzy
msgid "Tags"
msgstr "Tag"
@@ -2483,51 +2482,51 @@ 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 "Seksyon"
-#: src/generic/apt/aptitude_resolver_universe.cc:872
+#: src/generic/apt/aptitude_resolver_universe.cc:879
#, fuzzy
msgid "Cancel all user actions"
msgstr "Pakete na umaasa sa %s"
-#: src/generic/apt/aptitude_resolver_universe.cc:873
+#: src/generic/apt/aptitude_resolver_universe.cc:880
#, fuzzy
msgid "Remove packages"
msgstr "^Iluklok/tanggalin ang mga pakete"
-#: 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 "hindi totoong pakete"
-#: 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 essential packages"
msgstr "Ang mga sumusunod na pakete ay SIRA:"
-#: 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 "
@@ -2978,97 +2977,45 @@ msgstr ""
msgid "_File"
msgstr "^Isara"
-#: 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 "Gawin ang lahat ng naka-binbin na instal at mga tatanggalin"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Iluklok/tanggalin ang mga pakete"
-
-#: 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 "Suriin para sa mga bagong bersyon ng mga pakete"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Update ang pakete list"
-
-#: 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 ""
"Markahan ang lahat ng hindi upgradable na pakete na hindi kasama sa upgrade"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-msgid "Mark Up_gradable"
-msgstr "Markahan ng ^Upgradable"
-
-#: 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 "Kalimutan kung ano amg mga pakete na \"bago\""
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Kalimutan ang mga bagong pakete"
-
-#: src/gtk/aptitude.glade:94 src/ui.cc:2237
+#: src/gtk/aptitude.glade:71 src/ui.cc:2237
#, fuzzy
msgid "Cancel all pending installations, removals, holds, and upgrades."
msgstr "Gawin ang lahat ng naka-binbin na instal at mga tatanggalin"
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-msgid "Canc_el Pending Actions"
-msgstr "Pakete na umaasa sa %s"
-
-#: 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 "Burahin ang pakete files na na-download ng nakaraan"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Linisin ang mga cache ng pakete"
-
-#: 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 "Alisin ang pakete files na hindi na ma-download"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Linisin ang ^obsolete files"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Reload ang pakete cache"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "^Reload ang pakete cache"
-
-#: 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 "Magsayang ng oras sa pag-hahanap ng mga mina"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "^Maglaro ng Minesweeper"
-
-#: src/gtk/aptitude.glade:179 src/ui.cc:2262
+#: src/gtk/aptitude.glade:126 src/ui.cc:2262
#, fuzzy
msgid ""
"Run 'su' to become root; this will restart the program, but your settings "
@@ -3078,261 +3025,198 @@ msgstr ""
"iyong\n"
"settings ay hindi magagalaw"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Maging root"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Lumabas sa programa"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "^Umalis"
-
-#: 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 "Ulitin ang huling pakete operation o grupo ng operations"
-#: 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 "burahin"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pakete"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Mga Pananaw"
-#: 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 "Find _Dependency Chains"
-msgstr "^Dependency na pag-tagan"
-
-#: 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 "burahin"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Tulong"
-#: 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 "Update"
msgstr "Markahan ng ^Upgradable"
-#: 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 "Mga Pakete"
-#: 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
#, fuzzy
msgid "Preview"
msgstr "^Nakaraan"
-#: 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
#, fuzzy
msgid "Resolver"
msgstr "^Tanggalin"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
msgid "Install/Remove"
msgstr "naka-instol"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-#, fuzzy
-msgid "Remove"
-msgstr "^Tanggalin"
-
-#: 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
-#, fuzzy
-msgid "Keep"
-msgstr "^Itago"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-#, fuzzy
-msgid "Hold"
-msgstr "^Pigilin"
-
-#: 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 "Alisin ang filter sa mga listahan ng pakete"
-#: 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 "Apply ang filter sa listahan ng mga pakete"
-#: 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 "burahin"
+
+#: 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 "Paghahanap"
-#: 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 "Err "
-#: 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 "Dependensiya ng %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 "Files"
msgstr "^Isara"
-#: 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"
msgstr "Tag"
-#: 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 "Katayuan"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Di-kilalang anyo ng aksyon: %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 "
@@ -3341,139 +3225,122 @@ 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 "Di-kilalang anyo ng aksyon: %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
msgid "Rejected"
msgstr ""
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
msgid "No preference"
msgstr "PreDepends"
-#: 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
-#, fuzzy
-#| msgid "State"
-msgid "Status"
-msgstr "Katayuan"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
+#: src/gtk/aptitude.glade:1369
+msgid "Find a new solution"
msgstr ""
-#: src/gtk/aptitude.glade:1442
+#: src/gtk/aptitude.glade:1373
#, fuzzy
msgid "Calculate the next solution that has not yet been generated."
msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
-#: src/gtk/aptitude.glade:1443
-msgid "Find a new solution"
+#: src/gtk/aptitude.glade:1383
+msgid "gtk-apply"
msgstr ""
-#: src/gtk/aptitude.glade:1457
+#: src/gtk/aptitude.glade:1388
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 Summary"
msgstr "upgrade"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Pinanggalingan ng pakete: "
-#: 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 "Fix Manually"
msgstr "Markahang ^Manual"
-#: 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
#, fuzzy
msgid "Upgrade"
msgstr "upgrade"
-#: 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 "oo"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3526,38 +3393,38 @@ msgstr "Kinukuha ang Changelog"
msgid "Downloading changelogs"
msgstr "Kinukuha ang 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 na gamitin upang kunin ang mga changelog"
-#: 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 available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "upgrade"
msgstr[1] "upgrade"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
msgid "No upgrades are available."
msgstr "hindi naka-instol"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
msgid "Unable to calculate an upgrade."
msgstr "Hindi ma-buksan ang %s para sulatan"
-#: 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 "
@@ -3568,7 +3435,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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'>"
@@ -3579,46 +3446,46 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: 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 "Internal error: Default na hanay ng string ay unparsable"
-#: 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 "Find dependency chains: start"
msgstr "^Dependency na pag-tagan"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
msgid "Find dependency chains: end"
msgstr "^Dependency na pag-tagan"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
msgid "Find dependency chains: results"
msgstr "^Dependency na pag-tagan"
-#: 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 "No dependency chain found."
msgstr "^Dependency na pag-tagan"
@@ -3877,6 +3744,11 @@ msgstr "reinstall"
msgid "Downgrade"
msgstr "downgrade"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+#, fuzzy
+msgid "Remove"
+msgstr "^Tanggalin"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4059,6 +3931,22 @@ msgstr "hindi naka-instol"
msgid "Install/Upgrade"
msgstr "naka-instol"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Purge"
+
+#: src/gtk/gui.cc:1382
+#, fuzzy
+msgid "Keep"
+msgstr "^Itago"
+
+#: src/gtk/gui.cc:1387
+#, fuzzy
+msgid "Hold"
+msgstr "^Pigilin"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4118,118 +4006,118 @@ msgstr "hindi"
msgid "Unknown"
msgstr "Hindi kilala"
-#: 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 \"%s\"."
msgstr "Walang mga pakete na nagtulad sa pattern \"%s\"."
-#: 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 "Pakete: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
msgid "Upgrade to %s version %s"
msgstr "Bersyon"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
msgid "Install %s version %s"
msgstr "Bersyon"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "libsigc++ salin: %s\n"
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, fuzzy, c-format
msgid "Don't hold %s at its current version."
msgstr "Ang mga sumusunod na pakete ay may kulang na dependensiya:\n"
-#: 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 "Cancel any actions on %s."
msgstr "Pakete na umaasa sa %s"
-#: src/gtk/packagestab.cc:525
+#: src/gtk/packagestab.cc:528
#, c-format
msgid "Cancel the purge of %s."
msgstr ""
-#: src/gtk/packagestab.cc:527
+#: src/gtk/packagestab.cc:530
#, c-format
msgid "Cancel the removal of %s."
msgstr ""
-#: src/gtk/packagestab.cc:532
+#: src/gtk/packagestab.cc:535
#, c-format
msgid "Cancel the upgrade of %s."
msgstr ""
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:537
#, fuzzy, c-format
msgid "Cancel the installation of %s."
msgstr "Pakete na umaasa sa %s"
-#: src/gtk/packagestab.cc:536
+#: src/gtk/packagestab.cc:539
#, c-format
msgid "Cancel the downgrade of %s."
msgstr ""
-#: src/gtk/packagestab.cc:538
+#: src/gtk/packagestab.cc:541
#, c-format
msgid "Cancel the reinstallation of %s."
msgstr ""
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
msgid "Remove %s"
msgstr "^Tanggalin"
-#: 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 "Mark %s as automatically installed."
msgstr " markahanlagi - Markahan ang pakete para kusang mag instal\n"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr " alisin-ang-marka-lagi - Markahan ang pakete para i-manual instal\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\" ay paketeng bertwal na binibigay ng:\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: "
@@ -4255,28 +4143,28 @@ msgstr "%s; iinstolahin ang bersyon %s ng kusa"
msgid "%s is being installed manually."
msgstr "%s; iinstolahin ang bersyon %s ng kusa"
-#: 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 "Paghahanap"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Gumagawa ng view"
-#: 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 "Gumagawa ng view"
-#: 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 "
@@ -4292,7 +4180,7 @@ msgstr ""
" Ang pagharap ng puno nito ay maaring indicates na ilang bagay ay basag, "
"alin man sa dalawa sa iyong sistema o sa arkibo ng 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 "
@@ -4304,7 +4192,7 @@ msgstr ""
"fulfill ang dependencies, at ang planong aksyon ay magbunga ng walang "
"installed na pakete magpahayag ng 'importante' na dependency sa kanila.\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 "
@@ -4314,7 +4202,7 @@ msgstr ""
" Ang mga pakete ay maaring ma-upgraded, pero itoy itinagosa kasalukuyang "
"kaayuan para maiwasan ang pagbasag ng mga dependencies."
-#: 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 "
@@ -4324,7 +4212,7 @@ msgstr ""
" Ang mga pakete na ito ay nag-iinstalled dahil ito'y kailangan ng ibang "
"pakete na iyong pinili para sa installation."
-#: 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 "
@@ -4334,7 +4222,7 @@ msgstr ""
" Ang mga pakete na ito ay inalis dahil isa o marami sa kanyang dependencies "
"ay hindi na available, o dahil ibang pakete ay conflicts sa kanila."
-#: 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 "
@@ -4344,7 +4232,7 @@ msgstr ""
" lumang salin ng pakete na ito na kasalukuyan naka installed ay ma i-"
"installed."
-#: 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 "
@@ -4354,7 +4242,7 @@ msgstr ""
" Ang mga pakete ay maaaring i-upgrade, pero tinanong mo na gawin sa "
"kasalukuyang salin."
-#: 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."
@@ -4362,7 +4250,7 @@ msgstr ""
"Mga pakete na i-rereinstalled\n"
" Ang mga pakete na ito ay i-rereinstalled."
-#: 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 "
@@ -4372,7 +4260,7 @@ msgstr ""
" Ang mga pakete na ito ay manually na pinili para sa installation sa iyong "
"kompyuter."
-#: 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."
@@ -4380,7 +4268,7 @@ msgstr ""
"Mga pakete na aalisin\n"
" Ang mga pakete na ito ay manually na piniil para alisin."
-#: 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."
@@ -4388,7 +4276,7 @@ msgstr ""
"Mga pakete na i a-upgraded\n"
" Ang mga pakete na ito ay i a-upgraded sa bagong salin."
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4399,7 +4287,7 @@ msgstr ""
" Ang mga pakete na ito ay nag-iinstalled dahil ito'y kailangan ng ibang "
"pakete na iyong pinili para sa installation."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
msgid "Preview: "
msgstr "^Nakaraan"
@@ -4419,113 +4307,119 @@ 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 "Pakete"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
#, fuzzy
msgid "Not Installed"
msgstr "hindi naka-instol"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
msgid "Removing %s is rejected."
msgstr "Reconfiguring %s\n"
-#: src/gtk/resolver.cc:337
+#: src/gtk/resolver.cc:377
#, fuzzy, c-format
msgid "Canceling the installation of %s is rejected."
msgstr "Pakete na umaasa sa %s"
-#: src/gtk/resolver.cc:347
+#: src/gtk/resolver.cc:387
#, fuzzy, c-format
msgid "Canceling the removal of %s is rejected."
msgstr "Pakete na umaasa sa %s"
-#: src/gtk/resolver.cc:350
+#: src/gtk/resolver.cc:390
#, fuzzy, c-format
msgid "Keeping %s at version %s is rejected."
msgstr ""
"\n"
"Salin ng tingayaw: %s\n"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
msgid "Installing %s version %s is rejected."
msgstr "Bersyon"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "libsigc++ salin: %s\n"
-#: src/gtk/resolver.cc:369
+#: src/gtk/resolver.cc:409
#, fuzzy, c-format
msgid "Upgrading %s to version %s is rejected."
msgstr "Bersyon"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4535,7 +4429,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
@@ -4543,197 +4437,207 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: src/gtk/resolver.cc:1172 src/solution_fragment.cc:108
+#: src/gtk/resolver.cc:1226 src/solution_fragment.cc:108
#, fuzzy, c-format
msgid "%s depends upon %s"
msgstr "naka-depende sa"
-#: src/gtk/resolver.cc:1175 src/solution_fragment.cc:111
+#: src/gtk/resolver.cc:1229 src/solution_fragment.cc:111
#, fuzzy, c-format
msgid "%s pre-depends upon %s"
msgstr "pre-depends sa"
-#: src/gtk/resolver.cc:1178 src/solution_fragment.cc:114
+#: src/gtk/resolver.cc:1232 src/solution_fragment.cc:114
#, fuzzy, c-format
msgid "%s suggests %s"
msgstr "suhisyon"
-#: 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
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "rekomedasyon"
-#: src/gtk/resolver.cc:1184 src/solution_fragment.cc:120
+#: src/gtk/resolver.cc:1238 src/solution_fragment.cc:120
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "complikado sa"
-#: src/gtk/resolver.cc:1187 src/solution_fragment.cc:123
+#: src/gtk/resolver.cc:1241 src/solution_fragment.cc:123
#, fuzzy, c-format
msgid "%s breaks %s"
msgstr "papalitan"
-#: src/gtk/resolver.cc:1190 src/solution_fragment.cc:126
+#: src/gtk/resolver.cc:1244 src/solution_fragment.cc:126
#, fuzzy, c-format
msgid "%s replaces %s"
msgstr "papalitan"
-#: src/gtk/resolver.cc:1193 src/solution_fragment.cc:129
+#: src/gtk/resolver.cc:1247 src/solution_fragment.cc:129
#, fuzzy, c-format
msgid "%s obsoletes %s"
msgstr "lipas na"
-#: 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
#, fuzzy
msgid "Remove the following packages:"
msgstr "Ang mga sumusunod na pakete ay SIRA:"
-#: 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
#, fuzzy
msgid "Install the following packages:"
msgstr "Ang mga sumusunod na pakete ay SIRA:"
-#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781
+#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848
#, fuzzy
msgid "Keep the following packages:"
msgstr "Ang mga sumusunod na pakete ay SIRA:"
-#: 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
#, fuzzy
msgid "Upgrade the following packages:"
msgstr "Ang mga sumusunod na pakete ay SIRA:"
-#: 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
#, fuzzy
msgid "Downgrade the following packages:"
msgstr "Kinukuha ang mga pakete"
-#: 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:"
msgstr "Ang mga sumusunod na pakete ay SIRA:"
-#: src/gtk/resolver.cc:1444
+#: src/gtk/resolver.cc:1502
#, fuzzy, c-format
msgid "Remove %s [<big>%s</big> (%s)]"
msgstr "^Tanggalin"
-#: src/gtk/resolver.cc:1451
+#: src/gtk/resolver.cc:1509
#, fuzzy, c-format
msgid "Install %s [<big>%s</big> (%s)]"
msgstr "Bersyon"
-#: src/gtk/resolver.cc:1459
+#: src/gtk/resolver.cc:1517
#, fuzzy, c-format
msgid "Cancel the installation of %s"
msgstr "Pakete na umaasa sa %s"
-#: src/gtk/resolver.cc:1462
+#: src/gtk/resolver.cc:1520
#, fuzzy, c-format
msgid "Cancel the removal of %s"
msgstr "Pakete na umaasa sa %s"
-#: src/gtk/resolver.cc:1465
+#: src/gtk/resolver.cc:1523
#, fuzzy, c-format
msgid "Keep %s at version <big>%s</big> (%s)"
msgstr ""
"\n"
"Salin ng tingayaw: %s\n"
-#: src/gtk/resolver.cc:1472
+#: src/gtk/resolver.cc:1530
#, fuzzy, c-format
msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr "Nakuha %sB ng %s (%sB/s)."
-#: src/gtk/resolver.cc:1481
+#: src/gtk/resolver.cc:1539
#, fuzzy, c-format
msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
msgstr "Nakuha %sB ng %s (%sB/s)."
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>Remove</b> %s"
msgstr "^Tanggalin"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "^Tanggalin"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
msgid "<b>Keep</b> %s at version %s"
msgstr ""
"\n"
"Salin ng tingayaw: %s\n"
-#: src/gtk/resolver.cc:1546
+#: src/gtk/resolver.cc:1607
#, fuzzy, c-format
msgid "<b>keep</b> %s at version %s"
msgstr ""
"\n"
"Salin ng tingayaw: %s\n"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+msgid "<b>Cancel</b> the installation of %s"
+msgstr "Pakete na umaasa sa %s"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Pakete na umaasa sa %s"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
msgid "<b>Install</b> %s %s"
msgstr "Bersyon"
-#: src/gtk/resolver.cc:1555
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
msgid "<b>install</b> %s %s"
msgstr "Bersyon"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "libsigc++ salin: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "libsigc++ salin: %s\n"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, fuzzy, c-format
msgid "<b>Upgrade</b> %s to version %s"
msgstr "Bersyon"
-#: src/gtk/resolver.cc:1573
+#: src/gtk/resolver.cc:1640
#, fuzzy, c-format
msgid "<b>upgrade</b> %s to version %s"
msgstr "Bersyon"
-#: 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 "%s install"
msgid_plural "%s installs"
msgstr[0] "Instal"
msgstr[1] "Instal"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "^Tanggalin"
msgstr[1] "^Tanggalin"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "sleep"
msgid "%s keep"
@@ -4741,51 +4645,51 @@ msgid_plural "%s keeps"
msgstr[0] "tulog"
msgstr[1] "tulog"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "upgrade"
msgstr[1] "upgrade"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "downgrade"
msgstr[1] "downgrade"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "Rekomendasyon"
msgstr[1] "Rekomendasyon"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
msgid "No solutions yet."
msgstr ""
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
msgid "No dependency solution was found."
msgstr "^Dependency na pag-tagan"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
msgid "No solutions."
msgstr "^Mabalik ang options"
-#: 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 "%u solutions."
msgstr "^Mabalik ang options"
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7688,6 +7592,68 @@ msgid "Download Changelog"
msgstr "Kinukuha ang Changelog"
#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Iluklok/tanggalin ang mga pakete"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Update ang pakete list"
+
+#, fuzzy
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Markahan ng ^Upgradable"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Kalimutan ang mga bagong pakete"
+
+#, fuzzy
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Pakete na umaasa sa %s"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Linisin ang mga cache ng pakete"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Linisin ang ^obsolete files"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "^Reload ang pakete cache"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "^Maglaro ng Minesweeper"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Maging root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "^Umalis"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "burahin"
+
+#, fuzzy
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "^Dependency na pag-tagan"
+
+#, fuzzy
#~ msgid "Dependency Chain"
#~ msgstr "^Dependency na pag-tagan"
diff --git a/po/tr.po b/po/tr.po
index c4582a39..8a6ff758 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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: 2006-10-18 02:07+0300\n"
"Last-Translator: Erçin EKER <ercin.eker@linux.org.tr>\n"
"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -531,8 +531,8 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Bağımlılıklar çözümleniyor"
-#: 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 "Dahili Hata: beklenmeyen boş çözüm."
@@ -1576,7 +1576,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "Bağımlılıklar çözüleniyor..."
@@ -1677,7 +1677,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Aşağıdaki paketler bağımlılıkları karşılamıyor:\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 "<BOŞ>"
@@ -1814,8 +1814,8 @@ msgstr "Otomatik olarak kuruldu"
msgid "no"
msgstr "hayır"
-#: 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 "Sürüm:"
@@ -1894,12 +1894,12 @@ msgid "Obsoletes"
msgstr "Eskiyenler"
#: 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 "Sağladığı"
#: 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 "Tanım: "
@@ -2050,8 +2050,7 @@ msgstr ""
msgid "Candidate"
msgstr "AdaySür"
-#: 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 "Kur"
@@ -2191,7 +2190,7 @@ msgstr " KARŞILANAMAZ"
msgid "UNAVAILABLE"
msgstr "MEVCUT DEĞİL"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Etiketler"
@@ -2460,54 +2459,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 "Bölüm"
-#: 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 "Bekleyen eylemleri ip^tal et"
-#: 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 "Paket kaldırmak için '-'"
-#: 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 "gerçek bir paket değil"
-#: 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 "Aşağıdaki paketleri kaldır:"
-#: 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 "
@@ -2952,100 +2951,46 @@ msgstr ""
msgid "_File"
msgstr "Kapat"
-#: 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 "Bekleyen tüm kurulum ve kaldırma işlemlerini gerçekleştirir"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "^Paketleri kur/kaldır"
-
-#: 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 "Paketleri yeni sürümleri için denetler"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "Paket listesini ^güncelle"
-
-#: 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 ""
"Güncellenmemek üzere tutulan paketler dışındaki tüm paketleri güncellemek "
"için işaretler"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "^Yükseltibilir olanları işaretle"
-
-#: 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 "Yeni paketleri unutur"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "Yeni paketleri ^unut"
-
-#: 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 ""
"Bekleyen tüm kurulum, kaldırma, tutma ve yükseltme işlemlerini iptal et."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "Bekleyen eylemleri ip^tal et"
-
-#: 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 "Daha önce indirilmiş paket dosyalarını siler"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "Paket ön^belleğini temizle"
-
-#: 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 "Artık indirilemeyecek olan (eski) paket dosyalarını siler"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Eski d^osyaları temizle"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Paket önbelleğini yeniden yükle"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "Paket arabelleğini ^yenile"
-
-#: 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 "Mayınları bulmaya çalışırken zamanı boşa harcayın"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Mayın tarlası ^oyna"
-
-#: 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"
@@ -3053,259 +2998,199 @@ msgstr ""
"Root olmak için 'su' komutunu çalıştır; bu işlem uygulamayı yeniden "
"başlatır, ama ayarlarınız korunacaktır"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Root ol"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Uygulamadan çıkar"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "Çı^k"
-
-#: 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 "Son yapılan paket işlemini veya işlem grubunu geri alır"
-#: 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 "sil"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Paket"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Görünümler"
-#: 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 "Find _Dependency Chains"
-msgstr "^Bağımlılık işleme"
-
-#: 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 "sil"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Yardım"
-#: 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 "Liste Güncelleme"
-#: 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 "Paketler"
-#: 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 "Önizleme"
-#: 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 "Çözüm Üreticisi"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Kurulu"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Kaldır"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Temizle"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Koru"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Tut"
-
-#: 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 "Paket listesine uygulanan filtreyi kaldır"
-#: 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 "Paket listesini filtrele"
-#: 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 "sil"
+
+#: 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 "Ara"
-#: 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 "tekrarkur"
-#: 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 "Hata"
-#: 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 paketinin bağımlılıkları"
-#: 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 "Files"
msgstr "Kapat"
-#: 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 "Etiketler"
-#: 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 "Durum"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Bilinmeyen eylem tipi: %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 "
@@ -3314,149 +3199,130 @@ 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 "Bilinmeyen eylem tipi: %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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-msgid "Show an explanation of the solution"
-msgstr "çözüm için gerekli değişikliklerin açıklamasını göster"
-
-#: 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 "^Rededilmiş durumunu değiştir"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
msgid "No preference"
msgstr "ÖnBağımlılıklar"
-#: 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 "Durum"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "^Çözümü Denetle"
-#: 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 "Bağımlılık sorunları için sonraki çözümü seç."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "^Çözümü Denetle"
+#: 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 "Seçili çözümdeki eylemleri gerçekleştir."
-#: 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 "Yükselt"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Kaynak paketi: "
-#: 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 "Kılavuz"
-#: 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 "Yükselt"
-#: 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 "evet"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3511,21 +3377,21 @@ msgstr "Changelog İndiriliyor"
msgid "Downloading changelogs"
msgstr "Changelog İndiriliyor"
-#: 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 "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
-#: 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"
@@ -3533,19 +3399,19 @@ msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%d güncellenecek"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Kurulmadı"
-#: 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 paketi konumlandırılamıyor"
-#: 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 "
@@ -3555,7 +3421,7 @@ msgid_plural ""
"size='large'>%d</span>."
msgstr[0] ""
-#: 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'>"
@@ -3565,46 +3431,46 @@ msgid_plural ""
"%d</span> upgrades."
msgstr[0] ""
-#: 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 "İç hata: Varsayılan kolon dizgisi ayrıştırılamaz"
-#: 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 "Find dependency chains: start"
msgstr "^Bağımlılık işleme"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
msgid "Find dependency chains: end"
msgstr "^Bağımlılık işleme"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
msgid "Find dependency chains: results"
msgstr "^Bağımlılık işleme"
-#: 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 "No dependency chain found."
msgstr "^Bağımlılık işleme"
@@ -3863,6 +3729,10 @@ msgstr "Tekrar kur"
msgid "Downgrade"
msgstr "Eski sürümü kur"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Kaldır"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4054,6 +3924,20 @@ msgstr "kurulmadı"
msgid "Install/Upgrade"
msgstr "Kurulu"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Temizle"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Koru"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Tut"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4115,129 +3999,129 @@ msgstr "hayır"
msgid "Unknown"
msgstr "bilinmeyen"
-#: 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\" kalıbına uygun paket yok."
-#: 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 "Paket:"
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s sürümleri"
-#: src/gtk/packagestab.cc:498
+#: src/gtk/packagestab.cc:501
#, fuzzy, c-format
msgid "Install %s version %s"
msgstr "%s %s (%s) kuruluyor"
-#: src/gtk/packagestab.cc:506
+#: src/gtk/packagestab.cc:509
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "libsigc++ sürümü: %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 "Aşağıdaki paketleri mevcut sürümlerinde tut:"
-#: 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 "Bekleyen eylemleri ip^tal et"
-#: 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'i kaldırmayı iptal et"
-#: 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'i kaldırmayı iptal et"
-#: 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'i kaldırmayı iptal et"
-#: 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'in kurulumunu iptal et"
-#: 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'i kaldırmayı iptal et"
-#: 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'in kurulumunu iptal et"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
msgid "Remove %s"
msgstr "Kaldır"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Temizle"
-#: 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 "Paketi otomatik kurulmuş olarak işaretlemek için'&M'"
-#: src/gtk/packagestab.cc:601
+#: src/gtk/packagestab.cc:604
#, fuzzy, c-format
msgid "Mark %s as manually installed."
msgstr "Paketleri elle kurulmuş olarak işaretlemek için '&m'"
-#: 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 bir sanal paket, ve şu paket tarafından sağlanıyor:\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: "
@@ -4267,28 +4151,28 @@ msgstr "%s; otomatik olarak kurulacak"
msgid "%s is being installed manually."
msgstr "%s; otomatik olarak kurulacak"
-#: 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 "Ara"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Görüntü oluşturuluyor"
-#: 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 "Görüntü oluşturuluyor"
-#: 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 "
@@ -4303,7 +4187,7 @@ msgstr ""
" Bu bölümün varlığı büyük olasılıkla sisteminizde veya Debian arşivinde "
"birşeylerin bozuk olduğuna işarettir."
-#: 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 "
@@ -4315,7 +4199,7 @@ msgstr ""
"otomatik olarak kurulmuşlardı ve tasarladığınız eylemler bu paketler "
"üzerinde önemli bir bağımlılık kalmamasına neden olacak.\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 "
@@ -4325,7 +4209,7 @@ msgstr ""
" Bu paketler yükseltilebilirdi, fakat bağımlılıkların bozulmasını engellemek "
"için şu andaki durumlarında tutuluyorlar."
-#: 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 "
@@ -4335,7 +4219,7 @@ msgstr ""
" Bu paketler kurmak için seçtiğiniz bir başka paket tarafından gereksinim "
"duyuldukları için kurulacaklar."
-#: 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 "
@@ -4346,7 +4230,7 @@ msgstr ""
"olduklarından veya bir başka paket bağımlı oldukları paketlerle "
"çakıştığından silinecek."
-#: 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 "
@@ -4356,7 +4240,7 @@ msgstr ""
" Bu paketlerin şu anda kurulmuş olan sürümlerinden daha eski birer sürümleri "
"kurulacak."
-#: 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 "
@@ -4366,7 +4250,7 @@ msgstr ""
" Bu paketler güncellenebilirdi, fakat şu andaki sürümlerinde tutulmalarını "
"istediniz."
-#: 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."
@@ -4374,7 +4258,7 @@ msgstr ""
"Yeniden kurulacak paketler\n"
" Bu paketler yeniden kurulacak."
-#: 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 "
@@ -4383,7 +4267,7 @@ msgstr ""
"Kurulacak paketler\n"
" Bu paketleri sisteminize kurmak üzere seçtiniz."
-#: 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."
@@ -4391,7 +4275,7 @@ msgstr ""
"Kaldırılacak paketler\n"
" Bu paketleri sisteminizden kaldırılmak üzere seçtiniz."
-#: 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."
@@ -4399,7 +4283,7 @@ msgstr ""
"Yükseltilecek paketler\n"
" Bu paketler daha güncel sürümlerine yükseltilecek."
-#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -4410,7 +4294,7 @@ msgstr ""
" Bu paketler kurmak için seçtiğiniz bir başka paket tarafından gereksinim "
"duyuldukları için kurulacaklar."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4431,113 +4315,119 @@ 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 "Paket"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Kurulmadı"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "%s kaldırılıyor"
-#: 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'in kurulumunu iptal et"
-#: 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'i kaldırmayı iptal et"
-#: 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'in %s (%s) sürümünü tut"
-#: src/gtk/resolver.cc:357
+#: src/gtk/resolver.cc:397
#, fuzzy, c-format
msgid "Installing %s version %s is rejected."
msgstr "%s %s (%s) kuruluyor"
-#: src/gtk/resolver.cc:363
+#: src/gtk/resolver.cc:403
#, fuzzy, c-format
msgid "Downgrading %s to version %s is rejected."
msgstr "libsigc++ sürümü: %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 sürümleri"
-#: 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4546,195 +4436,207 @@ msgid_plural ""
"solutions."
msgstr[0] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
"Always prefer these actions over alternatives that have not been accepted."
msgstr[0] ""
-#: 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'e bağımlı"
-#: 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'e ön-bağımlı"
-#: 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'i teklif ediyor"
-#: 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'i tavsiye ediyor"
-#: 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 ile çakışıyor"
-#: src/gtk/resolver.cc:1187 src/solution_fragment.cc:123
+#: src/gtk/resolver.cc:1241 src/solution_fragment.cc:123
#, fuzzy, c-format
msgid "%s breaks %s"
msgstr "%s %s'in yerini alıyor"
-#: 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'in yerini alıyor"
-#: 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'i gereksiz kılıyor"
-#: 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 "Aşağıdaki paketleri kaldır:"
-#: 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 "Aşağıdaki paketleri kur:"
-#: 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 "Aşağıdaki paketleri kaldır:"
-#: 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 "Aşağıdaki paketleri yükselt:"
-#: 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 "Aşağıdaki paketlerin eski sürümünü kur:"
-#: 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 "Aşağıdaki bağımlılıkları çözülmemiş bırak:%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)]'i kaldır"
-#: 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)]'i kur"
-#: 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'in kurulumunu iptal et"
-#: 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'i kaldırmayı iptal et"
-#: 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'in %s (%s) sürümünü tut"
-#: 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'i yükselt [%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 "Alçalt %F [%s (%s) -> %s (%s)]"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>Remove</b> %s"
msgstr "Kaldır"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
msgid "<b>remove</b> %s"
msgstr "Kaldır"
-#: 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'in %s (%s) sürümünü tut"
-#: 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'in %s (%s) sürümünü tut"
-#: 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'in kurulumunu iptal et"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "%F'in kurulumunu iptal et"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "%F [%s (%s)]'i kur"
-#: 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)]'i kur"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>Downgrade</b> %s to version %s"
msgstr "libsigc++ sürümü: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
msgid "<b>downgrade</b> %s to version %s"
msgstr "libsigc++ sürümü: %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 sürümleri"
-#: 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 sürümleri"
-#: 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"
@@ -4742,7 +4644,7 @@ msgid "%s install"
msgid_plural "%s installs"
msgstr[0] "%d kurulacak"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4750,7 +4652,7 @@ msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "%d kaldırılacak"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4758,7 +4660,7 @@ msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "%d tutulacak"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4766,7 +4668,7 @@ msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "%d güncellenecek"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4774,41 +4676,41 @@ msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "%d eski sürümü kurulacak"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "^Önerilenleri Denetle"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Başka çözüm yok."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
msgid "No dependency solution was found."
msgstr "^Bağımlılık işleme"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Başka çözüm yok."
-#: 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 "Başka çözüm yok."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7608,6 +7510,75 @@ msgid "Download Changelog"
msgstr "Changelog'u İndir"
#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "^Paketleri kur/kaldır"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "Paket listesini ^güncelle"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "^Yükseltibilir olanları işaretle"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "Yeni paketleri ^unut"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "Bekleyen eylemleri ip^tal et"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "Paket ön^belleğini temizle"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Eski d^osyaları temizle"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "Paket arabelleğini ^yenile"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Mayın tarlası ^oyna"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Root ol"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "Çı^k"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "sil"
+
+#, fuzzy
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "^Bağımlılık işleme"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "çözüm için gerekli değişikliklerin açıklamasını göster"
+
+#, fuzzy
#~ msgid "Dependency Chain"
#~ msgstr "^Bağımlılık işleme"
diff --git a/po/uk.po b/po/uk.po
index 18a80c51..3d8dcc5e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-09-05 09:43+0200\n"
"Last-Translator: Borys Yanovych <borman@pravex.kiev.ua>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -671,8 +671,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 "Внутрішня помилка: неочікувана відсутність вирішення."
@@ -1769,7 +1769,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 "Розв'язання залежностей..."
@@ -1873,7 +1873,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>"
@@ -2009,8 +2009,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 "Версія: "
@@ -2089,12 +2089,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 "Опис: "
@@ -2261,8 +2261,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 "Встановити"
@@ -2412,7 +2411,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
#, fuzzy
#| msgid "Tag"
msgid "Tags"
@@ -2694,54 +2693,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 "%BRemove%b the following packages:%n"
msgid "Remove essential packages"
msgstr "%BВидалити%b такі пакунки:%n"
-#: 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 "
@@ -3196,98 +3195,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"
@@ -3295,261 +3240,200 @@ msgstr ""
"Запуск 'su' для отримання прав суперкористувача; програма буде перезапущена, "
"однак ваші налаштування збережуться"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "^Become root"
-msgid "_Become Root"
-msgstr "Стати користувачем root"
-
-#: 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 "Очистити"
-
-#: 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 "Tag"
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 "
@@ -3558,148 +3442,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 ""
@@ -3752,21 +3619,21 @@ msgstr "Завантаження списку змін"
msgid "Downloading changelogs"
msgstr "Завантаження списку змін"
-#: 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"
@@ -3776,19 +3643,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 "
@@ -3800,7 +3667,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'>"
@@ -3812,50 +3679,50 @@ 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."
@@ -4120,6 +3987,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 ""
@@ -4319,6 +4190,20 @@ msgstr "не встановлений"
msgid "Install/Upgrade"
msgstr "Встановлений"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "Очистити"
+
+#: 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 ""
@@ -4380,133 +4265,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 package named \"%s\" exists."
msgid "No packages matched \"%s\"."
msgstr "Пакунка з назвою \"%s\" не існує."
-#: 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 "libsigc++ version: %s\n"
msgid "Downgrade to %s version %s"
msgstr "Версія libsigc++: %s\n"
-#: src/gtk/packagestab.cc:517
+#: src/gtk/packagestab.cc:520
#, fuzzy, c-format
#| msgid "%BKeep%b the following packages at their current version:%n"
msgid "Don't hold %s at its current version."
msgstr "%BЗберегти%b поточні версії таких пакунків:%n"
-#: 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 "Очистити"
-#: 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: "
@@ -4536,28 +4421,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 "
@@ -4573,7 +4458,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 "
@@ -4585,7 +4470,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 "
@@ -4595,7 +4480,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 "
@@ -4605,7 +4490,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 "
@@ -4616,7 +4501,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 "
@@ -4626,7 +4511,7 @@ msgstr ""
" Будуть встановлені більш давні версії пакунків ніж ті, що встановлені на на "
"даний момент."
-#: 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 "
@@ -4636,7 +4521,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."
@@ -4644,7 +4529,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 "
@@ -4653,7 +4538,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."
@@ -4661,7 +4546,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."
@@ -4669,7 +4554,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 "
@@ -4679,7 +4564,7 @@ msgstr ""
" Ці пакунки встановлені або налаштовані не повністю; буде зроблена спроба "
"завершити їх встановлення."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4700,119 +4585,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 "libsigc++ version: %s\n"
msgid "Downgrading %s to version %s is rejected."
msgstr "Версія libsigc++: %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."
@@ -4823,7 +4714,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 ""
@@ -4832,208 +4723,220 @@ 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
#, fuzzy, c-format
#| msgid "depends on"
msgid "%s depends upon %s"
msgstr "залежить від"
-#: src/gtk/resolver.cc:1175 src/solution_fragment.cc:111
+#: src/gtk/resolver.cc:1229 src/solution_fragment.cc:111
#, fuzzy, c-format
#| msgid "pre-depends on"
msgid "%s pre-depends upon %s"
msgstr "попередньо залежить від"
-#: src/gtk/resolver.cc:1178 src/solution_fragment.cc:114
+#: src/gtk/resolver.cc:1232 src/solution_fragment.cc:114
#, fuzzy, c-format
#| msgid "suggests"
msgid "%s suggests %s"
msgstr "пропонує"
-#: 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
#, fuzzy, c-format
#| msgid "recommends"
msgid "%s recommends %s"
msgstr "рекомендує"
-#: src/gtk/resolver.cc:1184 src/solution_fragment.cc:120
+#: src/gtk/resolver.cc:1238 src/solution_fragment.cc:120
#, fuzzy, c-format
#| msgid "conflicts with"
msgid "%s conflicts with %s"
msgstr "конфліктує з"
-#: src/gtk/resolver.cc:1187 src/solution_fragment.cc:123
+#: src/gtk/resolver.cc:1241 src/solution_fragment.cc:123
#, fuzzy, c-format
#| msgid "breaks"
msgid "%s breaks %s"
msgstr "робить недієздатним"
-#: src/gtk/resolver.cc:1190 src/solution_fragment.cc:126
+#: src/gtk/resolver.cc:1244 src/solution_fragment.cc:126
#, fuzzy, c-format
#| msgid "replaces"
msgid "%s replaces %s"
msgstr "заміщує"
-#: src/gtk/resolver.cc:1193 src/solution_fragment.cc:129
+#: src/gtk/resolver.cc:1247 src/solution_fragment.cc:129
#, fuzzy, c-format
#| msgid "obsoletes"
msgid "%s obsoletes %s"
msgstr "робить застарілим"
-#: 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
#, fuzzy
#| msgid "%BRemove%b the following packages:%n"
msgid "Remove the following packages:"
msgstr "%BВидалити%b такі пакунки:%n"
-#: 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
#, fuzzy
#| msgid "%BInstall%b the following packages:%n"
msgid "Install the following packages:"
msgstr "%BВстановити%b такі пакунки:%n"
-#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781
+#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848
#, fuzzy
#| msgid "%BRemove%b the following packages:%n"
msgid "Keep the following packages:"
msgstr "%BВидалити%b такі пакунки:%n"
-#: 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
#, fuzzy
#| msgid "%BUpgrade%b the following packages:%n"
msgid "Upgrade the following packages:"
msgstr "%BОновити%b такі пакунки:%n"
-#: 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
#, fuzzy
#| msgid "%BDowngrade%b the following packages:%n"
msgid "Downgrade the following packages:"
msgstr "%BЗамінити на більш давні%b версії такі пакунки:%n"
-#: 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 "libsigc++ version: %s\n"
msgid "<b>Downgrade</b> %s to version %s"
msgstr "Версія libsigc++: %s\n"
-#: src/gtk/resolver.cc:1564
+#: src/gtk/resolver.cc:1631
#, fuzzy, c-format
#| msgid "libsigc++ version: %s\n"
msgid "<b>downgrade</b> %s to version %s"
msgstr "Версія libsigc++: %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"
@@ -5043,7 +4946,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"
@@ -5053,7 +4956,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"
@@ -5063,7 +4966,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"
@@ -5073,7 +4976,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"
@@ -5083,7 +4986,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"
@@ -5092,35 +4995,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 ""
@@ -8005,6 +7908,71 @@ msgid "Download Changelog"
msgstr "Завантажити список змін"
#, 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 "Стати користувачем root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "Вихід"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "delete"
+
+#, fuzzy
+#~| msgid "^Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Обробка залежностей"
+
+#, fuzzy
#~| msgid "^Dependency handling"
#~ msgid "Dependency Chain"
#~ msgstr "Обробка залежностей"
diff --git a/po/vi.po b/po/vi.po
index dc42155a..be00f2a4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude 0.4.x\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-04-22 19:08+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -634,8 +634,8 @@ msgstr "Lỗi nghiệm trọng trong bộ giải quyết"
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "[%d(%d)/...] Đang tháo gỡ các quan hệ phụ thuộc"
-#: 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 "Gặp lỗi nội bộ : giải pháp vô giá trị bất thường."
@@ -1707,7 +1707,7 @@ msgstr ""
"quan hệ phụ thuộc."
#: 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 "Đang tháo gỡ các quan hệ phụ thuộc..."
@@ -1818,7 +1818,7 @@ msgid "The following packages have unmet dependencies:\n"
msgstr "Những gói sau có quan hệ phụ thuộc chưa thỏa:\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 "<VÔ GIÁ TRỊ>"
@@ -1954,8 +1954,8 @@ msgstr "Đã cài đặt tự động"
msgid "no"
msgstr "không"
-#: 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 "Phiên bản: "
@@ -2035,12 +2035,12 @@ msgid "Obsoletes"
msgstr "Làm cũ"
#: 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 "Cung cấp"
#: 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 "Mô tả: "
@@ -2190,8 +2190,7 @@ msgstr "Hiện_thời"
msgid "Candidate"
msgstr "Ứng_cử"
-#: 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 "Cài"
@@ -2331,7 +2330,7 @@ msgstr "CHƯA ỔN"
msgid "UNAVAILABLE"
msgstr "KHÔNG CÓ SẴN"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054
msgid "Tags"
msgstr "Thẻ"
@@ -2608,54 +2607,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 "Phần"
-#: 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 "^Thôi các hành động bị hoãn"
-#: 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 "« - » để gỡ bỏ gói"
-#: 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 "không phải là gói thật"
-#: 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 "Gỡ bỏ những gói sau :"
-#: 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 "
@@ -3117,98 +3116,44 @@ msgstr ""
msgid "_File"
msgstr "Sai"
-#: 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 "Thực hiện mọi việc cài đặt và gỡ bỏ bị hoãn"
-#: src/gtk/aptitude.glade:27
-#, fuzzy
-#| msgid "^Install/remove packages"
-msgid "_Install/Remove Packages"
-msgstr "Cà^i/Bỏ gói"
-
-#: 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 "Kiểm tra có phiên bản gói mới chưa"
-#: src/gtk/aptitude.glade:43
-#, fuzzy
-#| msgid "^Update package list"
-msgid "_Update Package List"
-msgstr "^Cập nhật danh sách gói"
-
-#: 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 ""
"Đánh dấu mọi gói có khả năng nâng cấp mà không được giữ lại để nâng cấp"
-#: src/gtk/aptitude.glade:64
-#, fuzzy
-#| msgid "Mark Up^gradable"
-msgid "Mark Up_gradable"
-msgstr "Nhãn Nân^g cấp được"
-
-#: 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 "Quên những gói nào là « Mới »"
-#: src/gtk/aptitude.glade:80
-#, fuzzy
-#| msgid "^Forget new packages"
-msgid "_Forget New Packages"
-msgstr "^Quên các gói mới"
-
-#: 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 "Thôi các việc cài đặt, gỡ bỏ, giữ lại và nâng cấp bị hoãn."
-#: src/gtk/aptitude.glade:95
-#, fuzzy
-#| msgid "Canc^el pending actions"
-msgid "Canc_el Pending Actions"
-msgstr "^Thôi các hành động bị hoãn"
-
-#: 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 "Xóa các tập tin gói đã tải về trước"
-#: src/gtk/aptitude.glade:110
-#, fuzzy
-#| msgid "^Clean package cache"
-msgid "C_lean Package Cache"
-msgstr "^Xóa bộ nhớ tạm gói"
-
-#: 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 "Xóa các tập tin gói không còn tải về được"
-#: src/gtk/aptitude.glade:125
-#, fuzzy
-#| msgid "Clean ^obsolete files"
-msgid "Clean _Obsolete Files"
-msgstr "Xóa các tập tin ^cũ"
-
-#: src/gtk/aptitude.glade:144 src/ui.cc:2252
+#: src/gtk/aptitude.glade:103 src/ui.cc:2252
msgid "Reload the package cache"
msgstr "Nạp lại bộ nhớ tạm gói"
-#: src/gtk/aptitude.glade:145
-#, fuzzy
-#| msgid "^Reload package cache"
-msgid "_Reload Package Cache"
-msgstr "Nạp ^lại bộ nhớ tạm gói"
-
-#: 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 "Hoài phí thì giờ bằng cách cố gắng tìm mìn"
-#: src/gtk/aptitude.glade:160
-#, fuzzy
-#| msgid "^Play Minesweeper"
-msgid "_Play Minesweeper"
-msgstr "Chơi Quét ^Mìn"
-
-#: 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"
@@ -3216,261 +3161,200 @@ msgstr ""
"Hãy chạy lệnh « su » để trở thành người chủ: việc này sẽ khởi chạy lại chương "
"trình, còn giữ lại các thiết lập của bạn"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "Trở thành Người chủ"
-
-#: src/gtk/aptitude.glade:194 src/ui.cc:2265
+#: src/gtk/aptitude.glade:135 src/ui.cc:2265
msgid "Exit the program"
msgstr "Thoát khỏi chương trình"
-#: src/gtk/aptitude.glade:195
-#, fuzzy
-#| msgid "^Quit"
-msgid "_Quit"
-msgstr "T^hoát"
-
-#: 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 "Hồi lại thao tác (hay nhóm thao tác) gói cuối cùng"
-#: 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 "xóa"
-
-#: src/gtk/aptitude.glade:270
+#: src/gtk/aptitude.glade:205
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Gói"
-#: src/gtk/aptitude.glade:282
+#: src/gtk/aptitude.glade:217
#, fuzzy
#| msgid "Views"
msgid "_View"
msgstr "Xem"
-#: 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 "Quản lý quan hệ phụ thuộc"
-
-#: 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 "xóa"
-
-#: src/gtk/aptitude.glade:379
+#: src/gtk/aptitude.glade:296
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Trợ giúp"
-#: 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 "Cập nhật danh sách"
-#: 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 "Gói"
-#: 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 "Xem thử"
-#: 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 "Bộ tháo gỡ"
-#: src/gtk/aptitude.glade:462
+#: src/gtk/aptitude.glade:388
#, fuzzy
#| msgid "Installed"
msgid "Install/Remove"
msgstr "Đã cài"
-#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
-msgid "Remove"
-msgstr "Bỏ"
-
-#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
-#, fuzzy
-#| msgid "^Purge"
-msgid "Purge"
-msgstr "^Tẩy"
-
-#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
-msgid "Keep"
-msgstr "Giữ"
-
-#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
-msgid "Hold"
-msgstr "Giữ lại"
-
-#: 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 "Gỡ bỏ bộ lọc khỏi danh sách gói"
-#: 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 "Áp dụng bộ lọc vào danh sách gói"
-#: 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 "xóa"
+
+#: 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 "Tìm kiếm"
-#: 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 "cài lại"
-#: 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 "Lỗi "
-#: 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 "Phụ thuộc của %s"
-#: src/gtk/aptitude.glade:1076
+#: src/gtk/aptitude.glade:986
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Bản ghi đổi"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "Sai"
-#: 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 "Thẻ"
-#: 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 "Tình trạng"
+
+#: src/gtk/aptitude.glade:1216
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Không rõ kiểu hành động: %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 "
@@ -3479,148 +3363,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 "Không rõ kiểu hành động: %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 "Bật tắt ^Bác bỏ"
-#: src/gtk/aptitude.glade:1317
+#: src/gtk/aptitude.glade:1312
#, fuzzy
#| msgid "Preferences"
msgid "No preference"
msgstr "Tùy thích"
-#: 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 "Tình trạng"
-
-#: src/gtk/aptitude.glade:1415
-msgid "<b>Solutions</b>"
-msgstr ""
+#| msgid "^Examine Solution"
+msgid "Find a new solution"
+msgstr "X^em giải pháp"
-#: 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 "Chọn giải pháp vấn đề phụ thuộc kế tiếp."
-#: src/gtk/aptitude.glade:1443
-#, fuzzy
-#| msgid "^Examine Solution"
-msgid "Find a new solution"
-msgstr "X^em giải pháp"
+#: 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 "Thực hiện những hành động của giải pháp hiện thời được chọn."
-#: 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 "Nâng cấp"
-#: src/gtk/aptitude.glade:1636
+#: src/gtk/aptitude.glade:1572
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Gói nguồn: "
-#: 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 "Sổ tay"
-#: 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 "Nâng cấp"
-#: 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 "có"
-#: src/gtk/aptitude.glade:2201
+#: src/gtk/aptitude.glade:2157
msgid "gtk-no"
msgstr ""
@@ -3673,21 +3540,21 @@ msgstr "Đang tải về Bản ghi đổi"
msgid "Downloading changelogs"
msgstr "Đang tải về Bản ghi đổi"
-#: 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 "Địa chỉ URL cần dùng để tải về các bản ghi thay đổi (ChangeLog)"
-#: 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"
@@ -3695,19 +3562,19 @@ msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%d lần nâng cấp"
-#: src/gtk/dashboardtab.cc:629
+#: src/gtk/dashboardtab.cc:630
#, fuzzy
#| msgid "Not Installed"
msgid "No upgrades are available."
msgstr "Chưa cài đặt"
-#: src/gtk/dashboardtab.cc:641
+#: src/gtk/dashboardtab.cc:642
#, fuzzy
#| msgid "Unable to locate package %s"
msgid "Unable to calculate an upgrade."
msgstr "Không thể định vị gói %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 "
@@ -3717,7 +3584,7 @@ msgid_plural ""
"size='large'>%d</span>."
msgstr[0] ""
-#: 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'>"
@@ -3727,49 +3594,49 @@ msgid_plural ""
"%d</span> upgrades."
msgstr[0] ""
-#: 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 "Gặp lỗi nội bộ : không thể phân tích chuỗi cột mặc định"
-#: 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 "Quản lý quan hệ phụ thuộc"
-#: src/gtk/dependency_chains_tab.cc:79
+#: src/gtk/dependency_chains_tab.cc:82
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: end"
msgstr "Quản lý quan hệ phụ thuộc"
-#: src/gtk/dependency_chains_tab.cc:81
+#: src/gtk/dependency_chains_tab.cc:86
#, fuzzy
#| msgid "Dependency handling"
msgid "Find dependency chains: results"
msgstr "Quản lý quan hệ phụ thuộc"
-#: 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."
@@ -4034,6 +3901,10 @@ msgstr "Cài lại"
msgid "Downgrade"
msgstr "Hạ cấp"
+#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
+msgstr "Bỏ"
+
#: src/gtk/gui.cc:94
msgid "Remove and purge configuration/data"
msgstr ""
@@ -4227,6 +4098,20 @@ msgstr "chưa cài đặt"
msgid "Install/Upgrade"
msgstr "Đã cài"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "^Tẩy"
+
+#: src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr "Giữ"
+
+#: src/gtk/gui.cc:1387
+msgid "Hold"
+msgstr "Giữ lại"
+
#: src/gtk/gui.cc:1393
msgid "Set as automatic"
msgstr ""
@@ -4292,133 +4177,133 @@ msgstr "không"
msgid "Unknown"
msgstr "Không rõ"
-#: 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 "Không có gói tương ứng với mẫu « %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 "Gói: "
-#: src/gtk/packagestab.cc:490
+#: src/gtk/packagestab.cc:493
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "Phiên bản %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 "Cài(%s cung cấp %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 phiên bản: %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 "Giữ lại những gói sau ở phiên bản hiện thời:"
-#: 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 "^Thôi các hành động bị hoãn"
-#: 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 "Thôi việc gỡ bỏ %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 "Thôi việc gỡ bỏ %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 "Thôi việc gỡ bỏ %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 "Thôi việc cài đặt %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 "Thôi việc gỡ bỏ %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 "Thôi việc cài đặt %F"
-#: src/gtk/packagestab.cc:579
+#: src/gtk/packagestab.cc:582
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "Remove %s"
msgstr "Bỏ(%s)"
-#: src/gtk/packagestab.cc:583
+#: src/gtk/packagestab.cc:586
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Tẩy"
-#: 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 » để nhãn các gói đã được cài đặt tự động"
-#: 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 "Gói « %s » được cài đặt bằng tay.\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 » là gói ảo được cung cấp bởi:\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: "
@@ -4448,28 +4333,28 @@ msgstr "%s; sẽ được cài đặt tự động"
msgid "%s is being installed manually."
msgstr "%s; sẽ được cài đặt tự động"
-#: 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 "Tìm kiếm"
-#: src/gtk/pkgview.cc:715
+#: src/gtk/pkgview.cc:718
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Đang xây dựng ô xem"
-#: 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 "Đang xây dựng ô xem"
-#: 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 "
@@ -4485,7 +4370,7 @@ msgstr ""
" Cây này rất có thể ngụ ý là cái gì bị hỏng, hoặc trên hệ thống của ban hoặc "
"trong kho 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 "
@@ -4497,7 +4382,7 @@ msgstr ""
"kiện phụ thuộc, nhưng mà hành động đã định sẽ có kết quả là không có gói nào "
"được cài đặt khai báo quan hệ phụ thuộc « quan trọng » trên chúng.\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 "
@@ -4507,7 +4392,7 @@ msgstr ""
" Những gói này có thể được nâng cấp, nhưng chúng đã được duy trì trong tình "
"trạng hiện thời để tránh ngắt quan hệ phụ thuộc."
-#: 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 "
@@ -4517,7 +4402,7 @@ msgstr ""
" Những gói này đang được cài đặt vì chúng cần thiết bởi một gói khác mà bạn "
"đã chọn cài đặt."
-#: 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 "
@@ -4527,7 +4412,7 @@ msgstr ""
" Những gói này đang được xoá vì một hay nhiều gói cần thiết (điều kiện phụ "
"thuộc) cho chúng không còn sẵn sàng, hoặc vì gói khác xung đột với chúng."
-#: 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 "
@@ -4537,7 +4422,7 @@ msgstr ""
" Một phiên bản cũ của những gói này hơn điều hiện thời được cài đặt sẽ được "
"cài đặt."
-#: 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 "
@@ -4547,7 +4432,7 @@ msgstr ""
" Những gói này có thể được nâng cấp, nhưng mà bạn đã yêu cầu giữ lại chúng ở "
"phiên bản hiện thời."
-#: 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."
@@ -4555,7 +4440,7 @@ msgstr ""
"Gói sẽ được cài lại\n"
" Những gói này sẽ được cài lại."
-#: 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 "
@@ -4564,7 +4449,7 @@ msgstr ""
"Gói sẽ được cài\n"
" Những gói này đã được chọn bằng tay để cài đặt vào máy tính này."
-#: 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."
@@ -4572,7 +4457,7 @@ msgstr ""
"Gói se được gỡ bỏ\n"
" Những gói này đã được chọn bằng tay để gỡ bỏ."
-#: 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."
@@ -4580,7 +4465,7 @@ msgstr ""
"Gói sẽ được nâng cấp\n"
" Những gói này sẽ được nâng cấp lên phiên bản mới hơ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 "
@@ -4589,7 +4474,7 @@ msgstr ""
"Gói đã cài đặt bộ phận\n"
" Những gói này chưa được cài đặt và cấu hình đầy đủ nên sẽ thử cài đặt xong."
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4610,115 +4495,121 @@ 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 "Gói"
+
+#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275
msgid "Not Installed"
msgstr "Chưa cài đặt"
-#: src/gtk/resolver.cc:332
+#: src/gtk/resolver.cc:372
#, fuzzy, c-format
#| msgid "Removing %s"
msgid "Removing %s is rejected."
msgstr "Đang gỡ bỏ %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 "Thôi việc cài đặt %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 "Thôi việc gỡ bỏ %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 "Giữ %F ở phiên bản %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 "Cài(%s cung cấp %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 phiên bản: %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 "Phiên bản %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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4727,199 +4618,211 @@ msgid_plural ""
"solutions."
msgstr[0] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
"Always prefer these actions over alternatives that have not been accepted."
msgstr[0] ""
-#: 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 phụ thuộc vào %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 phụ thuộc sẵn vào %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 đề nghị %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 khuyên %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 xung đột với %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 ngắt %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 thay thế %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 làm cũ %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 "Gỡ bỏ những gói sau :"
-#: 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 "Cài đặt những gói sau :"
-#: 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 "Gỡ bỏ những gói sau :"
-#: 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 "Nâng cấp những gói sau :"
-#: 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 "Hạ cấp những gói sau :"
-#: 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 "Để những quan hệ phụ thuộc sau lại chưa được tháo gỡ :%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 "Gỡ bỏ %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 "Cài đặt %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 "Thôi việc cài đặt %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 "Thôi việc gỡ bỏ %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 "Giữ %F ở phiên bản %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 "Nâng cấp %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 "Hạ cấp %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 "Bỏ(%s)"
-#: src/gtk/resolver.cc:1538
+#: src/gtk/resolver.cc:1598
#, fuzzy, c-format
#| msgid "Remove(%s)"
msgid "<b>remove</b> %s"
msgstr "Bỏ(%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 "Giữ %F ở phiên bản %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 "Giữ %F ở phiên bản %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 "Thôi việc cài đặt %F"
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "<b>cancel</b> the installation of %s"
+msgstr "Thôi việc cài đặt %F"
+
+#: src/gtk/resolver.cc:1622
#, fuzzy, c-format
#| msgid "Install %F [%s (%s)]"
msgid "<b>Install</b> %s %s"
msgstr "Cài đặt %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 "Cài đặt %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 phiên bản: %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 phiên bản: %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 "Phiên bản %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 "Phiên bản %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"
@@ -4927,7 +4830,7 @@ msgid "%s install"
msgid_plural "%s installs"
msgstr[0] "%d lần cài"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4935,7 +4838,7 @@ msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "%d lần gỡ bỏ"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4943,7 +4846,7 @@ msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "%d lần giữ"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4951,7 +4854,7 @@ msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "%d lần nâng cấp"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4959,42 +4862,42 @@ msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "%d lần hạ cấp"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "Kiểm tra sự ^Khuyên"
-#: src/gtk/resolver.cc:1975
+#: src/gtk/resolver.cc:2042
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Không có giải pháp nữa."
-#: src/gtk/resolver.cc:1982
+#: src/gtk/resolver.cc:2049
#, fuzzy
#| msgid "Dependency handling"
msgid "No dependency solution was found."
msgstr "Quản lý quan hệ phụ thuộc"
-#: src/gtk/resolver.cc:1983
+#: src/gtk/resolver.cc:2050
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Không có giải pháp nữa."
-#: 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 "Không có giải pháp nữa."
-#: src/gtk/resolver.cc:2026
+#: src/gtk/resolver.cc:2093
#, c-format
msgid "Solution %s of %s (tier %s)."
msgstr ""
@@ -7805,6 +7708,71 @@ msgstr "Đang tải về Bản ghi đổi"
msgid "Download Changelog"
msgstr "Tải về Bản ghi đổi"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "Cà^i/Bỏ gói"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "^Cập nhật danh sách gói"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "Nhãn Nân^g cấp được"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "^Quên các gói mới"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "^Thôi các hành động bị hoãn"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "^Xóa bộ nhớ tạm gói"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "Xóa các tập tin ^cũ"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "Nạp ^lại bộ nhớ tạm gói"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "Chơi Quét ^Mìn"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "Trở thành Người chủ"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "T^hoát"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "xóa"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "Quản lý quan hệ phụ thuộc"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(cho %s)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8a12898a..396860ca 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-09-02 21:41+0800\n"
"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -590,8 +590,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 "内部错误：意料之外的空解决方案。"
@@ -1619,7 +1619,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "依赖关系分析中..."
@@ -1720,7 +1720,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>"
@@ -1856,8 +1856,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 "版本号："
@@ -1936,12 +1936,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 "描述："
@@ -2089,8 +2089,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 "安装"
@@ -2229,7 +2228,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 "标签"
@@ -2493,54 +2492,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 "取消待执行的动作(^E)"
-#: 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 "
@@ -2987,357 +2986,242 @@ msgstr ""
msgid "_File"
msgstr "假"
-#: 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 "安装/卸载软件包(^I)"
-
-#: 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 "更新软件包列表(^U)"
-
-#: 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 "标记可升级的(^g)"
-
-#: 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 "忘记新软件包(^F)"
-
-#: 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 "取消待执行的动作(^E)"
-
-#: 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 "清除软件包缓存(^C)"
-
-#: 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 "关闭过期文件(^O)"
-
-#: 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 "重新载入软件包缓存(^R)"
-
-#: 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 "玩扫雷游戏(^P)"
-
-#: 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"
msgstr "运行“su”成为 root。这将重新启动程序，但是您的设置将会被保存下来。"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "变成 root"
-
-#: 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 "退出(^Q)"
-
-#: 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 "删除"
-
-#: 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 "删除"
-
-#: 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 "清除(^P)"
-
-#: 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 "删除"
+
+#: 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 "重新安装"
-#: 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 "变更日志(^C)"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "假"
-#: 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 "
@@ -3346,150 +3230,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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-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 "放弃(^R)"
-#: 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 "检查解决方案(^E)"
-#: 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 "检查解决方案(^E)"
+#: 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 ""
@@ -3542,21 +3407,21 @@ msgstr "正在下载变更日志"
msgid "Downloading changelogs"
msgstr "正在下载变更日志"
-#: 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"
@@ -3564,19 +3429,19 @@ msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "升级 %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 "
@@ -3586,7 +3451,7 @@ msgid_plural ""
"size='large'>%d</span>."
msgstr[0] ""
-#: 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'>"
@@ -3596,49 +3461,49 @@ msgid_plural ""
"%d</span> upgrades."
msgstr[0] ""
-#: 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."
@@ -3903,6 +3768,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 ""
@@ -4096,6 +3965,20 @@ msgstr "未安装"
msgid "Install/Upgrade"
msgstr "已安装"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "清除(^P)"
+
+#: 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 ""
@@ -4161,133 +4044,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 "取消待执行的动作(^E)"
-#: 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 "清除(^P)"
-#: 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: "
@@ -4317,28 +4200,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 "
@@ -4352,7 +4235,7 @@ msgstr ""
" .\n"
" 该树的存在表示您的系统上或者 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 "
@@ -4363,7 +4246,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 "
@@ -4372,7 +4255,7 @@ msgstr ""
"被自动保持在当前状态的软件包\n"
" 这些软件包可以被升级，但是它们被保持在其当前状态以避免破坏依赖关系。"
-#: 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 "
@@ -4381,7 +4264,7 @@ msgstr ""
"被自动安装以满足依赖关系的软件包\n"
" 这些软件包被安装的原因是您选择安装的另一个软件包要求它们。"
-#: 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 "
@@ -4391,7 +4274,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 "
@@ -4400,7 +4283,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 "
@@ -4409,7 +4292,7 @@ msgstr ""
"被保持的软件包\n"
" 这些软件包可以升级，但是您已经要求将它们保持在当前版本。"
-#: 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."
@@ -4417,7 +4300,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 "
@@ -4426,7 +4309,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."
@@ -4434,7 +4317,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."
@@ -4442,7 +4325,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 "
@@ -4451,7 +4334,7 @@ msgstr ""
"被部分安装的软件包\n"
" 这些软件包没有被完全安装并配置；会尝试完成它们的安装。"
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4472,115 +4355,121 @@ 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4589,199 +4478,211 @@ msgid_plural ""
"solutions."
msgstr[0] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
"Always prefer these actions over alternatives that have not been accepted."
msgstr[0] ""
-#: 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"
@@ -4789,7 +4690,7 @@ msgid "%s install"
msgid_plural "%s installs"
msgstr[0] "安装 %d 个包"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4797,7 +4698,7 @@ msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "删除 %d 个包"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4805,7 +4706,7 @@ msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "保持 %d 个包"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4813,7 +4714,7 @@ msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "升级 %d 个包"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4821,42 +4722,42 @@ msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "降级 %d 个包"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "检查推荐结果(^R)"
-#: 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 ""
@@ -7570,6 +7471,76 @@ msgstr "正在下载变更日志"
msgid "Download Changelog"
msgstr "下载变更日志"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "安装/卸载软件包(^I)"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "更新软件包列表(^U)"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "标记可升级的(^g)"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "忘记新软件包(^F)"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "取消待执行的动作(^E)"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "清除软件包缓存(^C)"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "关闭过期文件(^O)"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "重新载入软件包缓存(^R)"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "玩扫雷游戏(^P)"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "变成 root"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "退出(^Q)"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "删除"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "处理依赖关系"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "查看关于解决方案中做的修改的说明"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(用于 %s)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6053adda..81b257d4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude\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-10-26 21:02+0100\n"
"Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -586,8 +586,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 "內部錯誤：意料之外的無效解決方案。"
@@ -1615,7 +1615,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
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 "相依賴關係分析中..."
@@ -1714,7 +1714,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>"
@@ -1850,8 +1850,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 "版本:"
@@ -1930,12 +1930,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 "描述: "
@@ -2083,8 +2083,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 "安裝"
@@ -2223,7 +2222,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 "標簽"
@@ -2487,54 +2486,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 "取消待執行的動作(^E)"
-#: 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 "
@@ -2980,357 +2979,242 @@ msgstr ""
msgid "_File"
msgstr "否"
-#: 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 "安裝/移除套件(^I)"
-
-#: 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 "更新套件列表(^U)"
-
-#: 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 "標記為可升級(^U)"
-
-#: 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 "忽略新套件(^F)"
-
-#: 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 "取消待執行的動作(^E)"
-
-#: 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 "清除套件快取(^C)"
-
-#: 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 "關閉過期檔案(^O)"
-
-#: 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 "重新載入套件快取(^R)"
-
-#: 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 "玩採地雷(^P)"
-
-#: 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"
msgstr "執行 'su' 成為 root。這將重新啟動程式，但是您的設置將會被保存下來。"
-#: src/gtk/aptitude.glade:180
-#, fuzzy
-#| msgid "Become root"
-msgid "_Become Root"
-msgstr "變成 root(^B)"
-
-#: 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 "退出(^Q)"
-
-#: 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 "刪除"
-
-#: 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 "刪除"
-
-#: 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 "清除(^P)"
-
-#: 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 "刪除"
+
+#: 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 "重新安裝"
-#: 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 "變更紀錄(^C)"
-#: src/gtk/aptitude.glade:1104
+#: src/gtk/aptitude.glade:1014
#, fuzzy
#| msgid "False"
msgid "Files"
msgstr "否"
-#: 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 "
@@ -3339,150 +3223,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
-#, fuzzy
-#| msgid "view an explanation of the changes in the solution"
-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 "放棄(^R)"
-#: 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 "檢查解決方案(^E)"
-#: 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 "檢查解決方案(^E)"
+#: 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 ""
@@ -3535,21 +3400,21 @@ msgstr "正在下載更改紀錄"
msgid "Downloading changelogs"
msgstr "正在下載更改紀錄"
-#: 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"
@@ -3557,19 +3422,19 @@ msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%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 "
@@ -3579,7 +3444,7 @@ msgid_plural ""
"size='large'>%d</span>."
msgstr[0] ""
-#: 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'>"
@@ -3589,49 +3454,49 @@ msgid_plural ""
"%d</span> upgrades."
msgstr[0] ""
-#: 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."
@@ -3896,6 +3761,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 ""
@@ -4088,6 +3957,20 @@ msgstr "尚未安裝"
msgid "Install/Upgrade"
msgstr "已安裝"
+#: src/gtk/gui.cc:1377
+#, fuzzy
+#| msgid "^Purge"
+msgid "Purge"
+msgstr "清除(^P)"
+
+#: 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 ""
@@ -4153,132 +4036,132 @@ 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 "取消待執行的動作(^E)"
-#: 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 "清除(^P)"
-#: 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 "Mark %s as manually installed."
msgstr "按'm'將套件標記為手動安裝"
-#: 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: "
@@ -4308,28 +4191,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 "
@@ -4343,7 +4226,7 @@ msgstr ""
" .\n"
" 此分類樹的存在表示您的系統上或者 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 "
@@ -4354,7 +4237,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 "
@@ -4363,7 +4246,7 @@ msgstr ""
"被自動保持在當前狀態的套件\n"
" 這些套件可以被升級，但是它們被保持在其當前狀態以避免破壞依賴關係。"
-#: 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 "
@@ -4372,7 +4255,7 @@ msgstr ""
"被自動安裝以滿足依賴關係的套件\n"
" 這些套件被安裝的原因是您選擇安裝的另一個套件要求它們。"
-#: 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 "
@@ -4382,7 +4265,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 "
@@ -4391,7 +4274,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 "
@@ -4400,7 +4283,7 @@ msgstr ""
"被保持的套件\n"
" 這些套件可以升級，但是您已經要求將它們保持在現有版本。"
-#: 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."
@@ -4408,7 +4291,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 "
@@ -4417,7 +4300,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."
@@ -4425,7 +4308,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."
@@ -4433,7 +4316,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 "
@@ -4442,7 +4325,7 @@ msgstr ""
"只安裝部份的套件\n"
" 這些套件未被完整安裝和設定；再一次地嘗試完成它們的安裝程序。"
-#: src/gtk/previewtab.cc:174
+#: src/gtk/previewtab.cc:179
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
@@ -4463,115 +4346,121 @@ 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] ""
-#: 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] ""
-#: src/gtk/resolver.cc:859
+#: src/gtk/resolver.cc:913
msgid ""
"Allow solutions containing this action, but do not prefer them to other "
"solutions."
@@ -4580,199 +4469,211 @@ msgid_plural ""
"solutions."
msgstr[0] ""
-#: src/gtk/resolver.cc:863
+#: src/gtk/resolver.cc:917
msgid ""
"Always prefer this action over alternatives that have not been accepted."
msgid_plural ""
"Always prefer these actions over alternatives that have not been accepted."
msgstr[0] ""
-#: 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"
@@ -4780,7 +4681,7 @@ msgid "%s install"
msgid_plural "%s installs"
msgstr[0] "%d 個可安裝"
-#: src/gtk/resolver.cc:1659
+#: src/gtk/resolver.cc:1726
#, fuzzy, c-format
#| msgid "%d removal"
#| msgid_plural "%d removals"
@@ -4788,7 +4689,7 @@ msgid "%s remove"
msgid_plural "%s removes"
msgstr[0] "%d 個移除"
-#: src/gtk/resolver.cc:1665
+#: src/gtk/resolver.cc:1732
#, fuzzy, c-format
#| msgid "%d keep"
#| msgid_plural "%d keeps"
@@ -4796,7 +4697,7 @@ msgid "%s keep"
msgid_plural "%s keeps"
msgstr[0] "%d 個保存"
-#: src/gtk/resolver.cc:1671
+#: src/gtk/resolver.cc:1738
#, fuzzy, c-format
#| msgid "%d upgrade"
#| msgid_plural "%d upgrades"
@@ -4804,7 +4705,7 @@ msgid "%s upgrade"
msgid_plural "%s upgrades"
msgstr[0] "%d 個可升級"
-#: src/gtk/resolver.cc:1677
+#: src/gtk/resolver.cc:1744
#, fuzzy, c-format
#| msgid "%d downgrade"
#| msgid_plural "%d downgrades"
@@ -4812,42 +4713,42 @@ msgid "%s downgrade"
msgid_plural "%s downgrades"
msgstr[0] "%d 個可下載"
-#: src/gtk/resolver.cc:1683
+#: src/gtk/resolver.cc:1750
#, fuzzy, c-format
#| msgid "Audit ^Recommendations"
msgid "%s unresolved recommendation"
msgid_plural "%s unresolved recommendations"
msgstr[0] "檢查推薦結果(^R)"
-#: 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 ""
@@ -7551,6 +7452,76 @@ msgstr "正在下載更改紀錄"
msgid "Download Changelog"
msgstr "下載更動記錄"
+#, fuzzy
+#~| msgid "^Install/remove packages"
+#~ msgid "_Install/Remove Packages"
+#~ msgstr "安裝/移除套件(^I)"
+
+#, fuzzy
+#~| msgid "^Update package list"
+#~ msgid "_Update Package List"
+#~ msgstr "更新套件列表(^U)"
+
+#, fuzzy
+#~| msgid "Mark Up^gradable"
+#~ msgid "Mark Up_gradable"
+#~ msgstr "標記為可升級(^U)"
+
+#, fuzzy
+#~| msgid "^Forget new packages"
+#~ msgid "_Forget New Packages"
+#~ msgstr "忽略新套件(^F)"
+
+#, fuzzy
+#~| msgid "Canc^el pending actions"
+#~ msgid "Canc_el Pending Actions"
+#~ msgstr "取消待執行的動作(^E)"
+
+#, fuzzy
+#~| msgid "^Clean package cache"
+#~ msgid "C_lean Package Cache"
+#~ msgstr "清除套件快取(^C)"
+
+#, fuzzy
+#~| msgid "Clean ^obsolete files"
+#~ msgid "Clean _Obsolete Files"
+#~ msgstr "關閉過期檔案(^O)"
+
+#, fuzzy
+#~| msgid "^Reload package cache"
+#~ msgid "_Reload Package Cache"
+#~ msgstr "重新載入套件快取(^R)"
+
+#, fuzzy
+#~| msgid "^Play Minesweeper"
+#~ msgid "_Play Minesweeper"
+#~ msgstr "玩採地雷(^P)"
+
+#, fuzzy
+#~| msgid "Become root"
+#~ msgid "_Become Root"
+#~ msgstr "變成 root(^B)"
+
+#, fuzzy
+#~| msgid "^Quit"
+#~ msgid "_Quit"
+#~ msgstr "退出(^Q)"
+
+#, fuzzy
+#~| msgid "delete"
+#~ msgid "gtk-delete"
+#~ msgstr "刪除"
+
+#, fuzzy
+#~| msgid "Dependency handling"
+#~ msgid "Find _Dependency Chains"
+#~ msgstr "處理相依關係"
+
+#, fuzzy
+#~| msgid "view an explanation of the changes in the solution"
+#~ msgid "Show an explanation of the solution"
+#~ msgstr "查看關於解決方案中做的修改的說明"
+
#~ msgid "(for %s)"
#~ msgid_plural "(for %s)"
#~ msgstr[0] "(用於 %s)"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 20:12:48 +0000