[Aptitude-svn-commit] r3629 - branches/aptitude-0.3/aptitude/po

Daniel Burrows dburrows at costa.debian.org
Wed Jul 6 22:11:05 UTC 2005


Author: dburrows
Date: Wed Jul  6 22:10:50 2005
New Revision: 3629

Modified:
   branches/aptitude-0.3/aptitude/po/aptitude.pot
   branches/aptitude-0.3/aptitude/po/ar.po
   branches/aptitude-0.3/aptitude/po/bs.po
   branches/aptitude-0.3/aptitude/po/ca.po
   branches/aptitude-0.3/aptitude/po/cs.po
   branches/aptitude-0.3/aptitude/po/da.po
   branches/aptitude-0.3/aptitude/po/de.po
   branches/aptitude-0.3/aptitude/po/el.po
   branches/aptitude-0.3/aptitude/po/es.po
   branches/aptitude-0.3/aptitude/po/eu.po
   branches/aptitude-0.3/aptitude/po/fi.po
   branches/aptitude-0.3/aptitude/po/fr.po
   branches/aptitude-0.3/aptitude/po/gl.po
   branches/aptitude-0.3/aptitude/po/it.po
   branches/aptitude-0.3/aptitude/po/ja.po
   branches/aptitude-0.3/aptitude/po/lt.po
   branches/aptitude-0.3/aptitude/po/nb.po
   branches/aptitude-0.3/aptitude/po/nl.po
   branches/aptitude-0.3/aptitude/po/nn.po
   branches/aptitude-0.3/aptitude/po/pl.po
   branches/aptitude-0.3/aptitude/po/pt.po
   branches/aptitude-0.3/aptitude/po/pt_BR.po
   branches/aptitude-0.3/aptitude/po/ro.po
   branches/aptitude-0.3/aptitude/po/ru.po
   branches/aptitude-0.3/aptitude/po/sk.po
   branches/aptitude-0.3/aptitude/po/tl.po
   branches/aptitude-0.3/aptitude/po/tr.po
   branches/aptitude-0.3/aptitude/po/vi.po
   branches/aptitude-0.3/aptitude/po/zh_CN.po
   branches/aptitude-0.3/aptitude/po/zh_TW.po
Log:
Ran update-po.

Modified: branches/aptitude-0.3/aptitude/po/aptitude.pot
==============================================================================
--- branches/aptitude-0.3/aptitude/po/aptitude.pot	(original)
+++ branches/aptitude-0.3/aptitude/po/aptitude.pot	Wed Jul  6 22:10:50 2005
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -859,62 +859,66 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr ""
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr ""
@@ -1214,7 +1218,7 @@
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -2078,7 +2082,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr ""
 
@@ -2282,7 +2286,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr ""
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr ""
 
@@ -3557,491 +3561,491 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr ""
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
 "upgrade."
 msgstr ""
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, c-format
 msgid "Unable to open %ls"
 msgstr ""
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
 msgstr ""
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
 msgstr ""
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr ""
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr ""
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr ""
 
@@ -4110,7 +4114,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr ""
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/ar.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ar.po	(original)
+++ branches/aptitude-0.3/aptitude/po/ar.po	Wed Jul  6 22:10:50 2005
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_po\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-04-07 00:23+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
@@ -911,66 +911,70 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "الحزم التالية لها معتمدات غير متوفرة:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "الحزمة التالية معطوبة:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "تعذر فتح %s للكتابة"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "خطأ في كتابة ملف الوضع"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "ردّ غير صالح.  رجاء أدخل أمراً صالحاً أ '؟' للمساعدة.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "ردّ غير صالح.  رجاء أدخل أمراً صالحاً أ '؟' للمساعدة.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "البحث: يجب أن تعطي كلمة بحث واحدة على الأقل\n"
@@ -1270,7 +1274,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "لم يمكن تنظيف أدلة اللوائح"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "حذف الملفات المنزلة الملغاة"
 
@@ -2142,7 +2146,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr ""
 
@@ -2347,7 +2351,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "حزمة"
 
@@ -3738,44 +3742,44 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "النسخ"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "استمر بالفعل"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "إجهاض التثبيت"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "معاينة تثبيت الحزم"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "عرض و/أو تعديل الأعمال التي ستتم"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^سابق"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "بعض الحزم كانت معطوبة وتمّ إصلاحها."
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3784,23 +3788,23 @@
 "تثبيت/إزالة الحزم بتطلب صلاحيات إداريّة، والتي\n"
 "لا تملكها حاليّاً.  هل تود التغيّر إلى حساب الجذر؟\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "تحوُّل إلى جذر"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "لا تحوّل إلى جذر"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "هناك عملية تحديث أو تثبيت حزم تجري حالياً."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "لم يتمّ جدولة تثبيت، أو إزالة أو ترقية أيّة حزم."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3812,7 +3816,7 @@
 "يمكن ترقية بعض الحزم، إلا أنّك لم تختر ترقيتها.\n"
 "اكتب \"U\" كي تحضّر الترقية."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3821,112 +3825,112 @@
 "تحديث لوائح الحزم بتطلب صلاحيات إداريّة، والتي\n"
 "لا تملكها حاليّاً.  هل تود التغيّر إلى حساب الجذر؟\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "التنظيف أثناء القيام بالتنزيل غير مسموح به"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "حذف الملفات المنزلة"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "تم حذف ملفات الحزم المنزلة"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "ملفات الحزم المنزلة الملغاة تم حذفها"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "تعذر فتح %s للكتابة"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^تثبيت/إزالة الحزم"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "إجراء كل عمليات التثبيت والإزالة المؤخَّرة"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^تحديث لائحة الحزم"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "التحقق من وجود نسخ جديدة من الحزم"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^نسيان الحزم الجديدة"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "نسيان أيّ الحزم هي \"جديدة\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^تنظيف مخزن الحزم"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "حذف ملفات الحزم التي تم تنزيلها من قبل"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "حذف الملفاة ال^ملغية"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "حذف ملفات الحزم التي لا يمكن تنزيلها بعد الآن"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "تعليم ال^قابلة للترقية"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "تعليم كل الحزم القابلة للترقية والتي ليست مبقاة للترقية"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^لعب كانسة الألغام"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^تحوّل إلى مستخدم جذر"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3935,78 +3939,78 @@
 "استخدم 'su' كي تصبح مستخدم جذر؛ سيقوم هذا بإعادة تشغيل البرنامج، ولكن سيتم\n"
 "الإبقاء على إعداداتك"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^إعادة تحميل مخزن الحزم"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "إعادة تحميل مخزن الحزم"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^خروج"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "الخروج من البرنامج"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "تراجع"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "التراجع عن آخر عملية حزمة أو مجموعة من العمليات"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^تثبيت"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "تعليم الحزمة المحددة حالياً للتثبيت أو الترقية"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "إ^زالة"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "تعليم الحزمة المحددة حالياً للإزالة"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^إلغاء"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "تعليم الحزمة المحددة حالياً وملفات تهيئتها للإزالة"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^محافظة"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "إلغاء أيّ عمل على الحزمة المحددة"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "إ^بقاء"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "إلغاء أي عمل على الحزمة المحددة، وحمايتها من الترقيات المستقبليّة"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "تحديد ^تلقائي"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4015,11 +4019,11 @@
 "تحديد الحزمة المحدّدة على أنها ثُبتت تلقائيّاً؛\n"
 "سوف يتم إزالتها إن لم تعتمد عليها أية حزمة أخرى"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "تحديد ^يدوي"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4028,11 +4032,11 @@
 "تحديد الحزمة المحدّدة على أنها ثُبتت يدويّاً؛\n"
 "لن يتم إزالتها إلا إن قمت بذلك"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^منع النسخة"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4041,204 +4045,204 @@
 "منع تثبيت النسخة المرشحة من الحزمة المحددة؛\n"
 "أما النسخ الأجدد من الحزمة فسيتم تثبيتها كالعادة"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "^معلومات"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "عرض مزيد من المعلومات حول الحزمة المحدّدة"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^سجل التغيير"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "عرض سجل تغيير دبيان للحزمة المحدّدة"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^بحث"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "البحث عن حزمة"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "البحث ^مجدّداً"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "تكرار البحث الأخير"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^حدّ العرض"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "تصفية لائحة الحزم"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "إ^زالة حدّ العرض"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "إزالة التصفية من لائحة الحزم"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "عثور على ^معطوبة"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "العثور على الحزمة التالية ذات المعتمدات الغير مستوفية"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "خيارات ^واجهة المستخدم"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "تغيير الإعدادات التي تؤثر على واجهة المستخدم"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "إ^دارة المعتمدات"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "تغيير الإعدادات التي تؤثر على كيفية التعامل مع معتمدات الحزم"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^متفرقات"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "تغيير إعدادات البرنامج المختلفة"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^استعادة الخيارات"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "إعادة كل الإعدادات إلى افتراضيّات النظام"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^تالي"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "عرض الشاشة التالية"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^سابق"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "عرض الشاشة السابقة"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^إغلاق"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "إغلاق هذه الشاشة"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "^عرض حزم جديد"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "إنشاء عرض حزم افتراضي جديد"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "^مستعرض تصنيفي جديد"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "استعراض الحزم بحسب الصنف"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^حول"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "عرض معلومات حول هذا البرنامج"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^مساعدة"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "عرض المساعدة الفورية"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "دليل ال^مستخدم"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "عرض دليل البرنامج المفصّل"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "عرض لائحة بالأسئلة الأكثر طرحاً"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "عرض التغييرات المهمة التي تمت في كل نسخة من البرنامج"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^الرخصة"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "عرض الشروط التي يمكنك نسخ البرنامج ضمنها"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "أعمال"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "بحث"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "خيارات"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "عروض"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "مساعدة"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4246,11 +4250,11 @@
 msgstr ""
 "%s: قائمة  %s: مساعدة  %s: خروج  %s: تحديث  %s: تنزيل/تثبيت/إزالة الحزم"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "no_key"
 
@@ -4321,7 +4325,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "آخ!  قابلت إشارة خروج SIGQUIT، جاري التنفيذ..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/bs.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/bs.po	(original)
+++ branches/aptitude-0.3/aptitude/po/bs.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2004-05-08 17:40+0100\n"
 "Last-Translator: Safir Šećerović <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at lugbih.org>\n"
@@ -867,63 +867,67 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr ""
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr ""
@@ -1224,7 +1228,7 @@
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -2089,7 +2093,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr ""
 
@@ -2293,7 +2297,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr ""
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr ""
 
@@ -3575,493 +3579,493 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Verzija:"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
 "upgrade."
 msgstr ""
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, c-format
 msgid "Unable to open %ls"
 msgstr ""
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
 msgstr ""
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
 msgstr ""
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 #, fuzzy
 msgid "^Changelog"
 msgstr "Poništi"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 #, fuzzy
 msgid "Remove the filter from the package list"
 msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opcije"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr ""
 
@@ -4131,7 +4135,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr ""
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/ca.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ca.po	(original)
+++ branches/aptitude-0.3/aptitude/po/ca.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_0.2.13-2\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2004-07-22 17:53+0100\n"
 "Last-Translator: Aleix Badia i Bosch <a.badia at callusdigital.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -940,68 +940,72 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "No s'han trobat les dependències del paquets següents:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Els paquets següents contenen errors."
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "No s'ha pogut obrir %s per a l'escriptura"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "S'ha produït un error en escriure el fitxer d'estat"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "La resposta no és vàlid. Introduïu una ordre vàlid o '?' per a ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "La resposta no és vàlid. Introduïu una ordre vàlid o '?' per a ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "cerca: heu de proporcionar, com a mínim, un terme de cerca\n"
@@ -1303,7 +1307,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "No s'han pogut netejar els directoris de la llista"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "S'estan suprimint els fitxers baixats obsolets"
 
@@ -2248,7 +2252,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Busca mines"
 
@@ -2458,7 +2462,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paquet"
 
@@ -4081,45 +4085,45 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Versions"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continua"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Previsualització de la instal·lació de paquets"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Visualitza i/o ajusta les accions que es duran a terme"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^Ante"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns paquets contenien errors i s'han arreglat"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Perdeu el temps intentant trobar les mines"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4129,23 +4133,23 @@
 "d'administrador,\n"
 "els quals actualment no teniu. Voleu canviar al compte de superusuari?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Esdevé superusuari"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "No esdevinguis superusuari"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "La llista de paquets ja s'està actualitzant o instal·lant."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "No s'instal·larà, actualitzarà o suprimirà cap paquet."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4157,7 +4161,7 @@
 "Alguns paquets es podrien actualitzar, però no heu escollit fer-ho.\n"
 "Premeu \"U\" per preparar-ne una actualització."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4166,115 +4170,115 @@
 "El procés d'actualitzar paquets precisa de privilegis d'administrador,\n"
 "els quals actualment no teniu. Voleu canviar al compte de superusuari?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Perdeu el temps intentant trobar les mines"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 "La tasca de neteja no es pot realitzar quan s'està realitzant una baixada"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "S'estan suprimint els fitxers baixats"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "S'han suprimit els fitxers dels paquets baixats"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "S'han suprimit els fitxers del paquets baixats"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Perdeu el temps intentant trobar les mines"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "No s'ha pogut obrir %s per a l'escriptura"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Instal·la/suprimeix els paquets"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Realitza totes les instal·lacions i supressions pendents"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "Act^ualitza la llista de paquets"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Verifica si hi ha noves versions dels paquets"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Oblida els paquets nous"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Oblida quins paquets són \"nous\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Neteja la memòria ^cau dels paquets"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Suprimeix els fitxers dels paquets prèviament baixats"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Neteja els fitxers ^obsolets"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Suprimeix els fitxers dels paquets que no es podran tornar a baixar"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Marca com a ^actualitzable"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marca tots els paquets actualitzables que no estiguin congelats per a "
 "l'actualització"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Juga al busca mines"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Sigues superusuari"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4283,72 +4287,72 @@
 "Executeu l'ordre 'su' per ser superusuari. Aquesta ordre reinicia el "
 "programa però manté els paràmetres personals."
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Recarrega la memòria cau dels paquets"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Torna a carregar la memòria cau dels paquets"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "Su^rt"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfés l'última operació o grup d'operacions del paquets"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instal·la"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Senyala els paquets seleccionats per a la corresponent instal·lació o "
 "actualització"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "Sup^rimeix"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Senyala els paquets seleccionats per a la corresponent supressió"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Purga"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Senyala els paquets seleccionats i els fitxers de configuració relacionats "
 "per a la corresponents supressió"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "Man^té"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Cancel·la qualsevol acció al paquet seleccionat"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "Con^gela"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4356,11 +4360,11 @@
 "Cancel·la qualsevol acció al paquet seleccionat i protegeix-lo de futures "
 "actualitzacions"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Marca ^Automàtic"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4369,11 +4373,11 @@
 "Marca els paquets seleccionat com a instal·lats automàticament;\n"
 "se suprimiran automàticament si cap paquet en depèn"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Marca ^Manual"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4382,11 +4386,11 @@
 "Marca els paquets seleccionats com a instal·lats manualment;\n"
 "no se suprimiran si no ho feu vosaltres manualment"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Prohibeix la versió"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4395,207 +4399,207 @@
 "Prohibeix la instal·lació de la versió candidata del paquet seleccionat;\n"
 "les noves versions del paquet s'instal·laran"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformació"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Mostra més informació dels paquets seleccionats"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "Registre de modifi^cacions"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Mostra el registre de modificacions de Debian dels paquets seleccionats"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Cerca"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Cerca un paquet"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Torna a cerc^ar"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Repeteix l'última cerca"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Limita la visualització"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Aplica un filtre a la llista de paquets"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "No limits la vis^ualització"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Suprimeix el filtre de la llista de paquets"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "C^erca els trencats"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Cerca el següent paquet amb dependències no resoltes"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Opcions de l'I^U"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Canvia els paràmetres relacionats amb la interfície d'usuari"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Gestió de les ^dependències"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Canvia els paràmetres que fan referència al mode de gestionar les "
 "dependències dels paquets"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Diversos"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Canvia diversos paràmetres de programa"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Recupera les opcions"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Reinicia tots els paràmetres als predeterminats del sistema"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "Següe^nt"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Mostra la visualització següent"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Ante"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Mostra la visualització anterior"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "Tan^ca"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Tanca aquesta visualització"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nova ^vista de paquets"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Crea una nova vista de paquets predeterminada"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nou na^vegador per categories"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Navega pels paquets per categories"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "Qu^ant a"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Mostra la informació sobre aquest programa"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "A^juda"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Mostra la informació en línia"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Manual d'usuari"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Mostra el manual detallat del programa"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "PM^F"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Mostra una llista de les preguntes més freqüents"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Mostra els canvis importants realitzats en cada versió del programa"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Llicència"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Mostra les condicions sota les quals podeu copiar el programa"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Accions"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opcions"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Vistes"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4604,11 +4608,11 @@
 "%s: Menú  %s: Ajuda  %s: Surt  %s: Actualitza  %s: Baixa/Instal·la/Suprimeix "
 "Paquets"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "no_key"
 
@@ -4681,7 +4685,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Uix!  s'ha obtingut un SIGQUIT, s'està morint..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/cs.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/cs.po	(original)
+++ branches/aptitude-0.3/aptitude/po/cs.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-15 20:42+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -912,62 +912,66 @@
 msgstr ""
 "Úpravy způsobí, že se aktuální řešení zahodí a přepočítá se podle potřeb."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Následující akce vyřeší tyto závislosti:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Přijmout toto řešení? [Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Končím všechny snahy na vyřešení těchto závislostí."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "K dispozici jsou následující příkazy:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Soubor, do kterého zapsat stav řešitele:"
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Nemohu otevřít %s pro zápis"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Chyba při zápisu duševního stavu řešitele do %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Chybná odpověď; zadejte některý z následujících příkazů:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "V přiděleném čase nebylo nalezeno řešení. Zkusit důkladněji? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Chybná odpověď; zadejte 'y' nebo 'n'."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Nemohu vyřešit závislosti! Vzdávám se..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Žádná další řešení."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "hledání: Musíte zadat alespoň jeden hledaný term\n"
@@ -1267,7 +1271,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Nemohu vyčistit adresáře seznamů"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Mažu staré stažené soubory"
 
@@ -2161,7 +2165,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Varování: vizuální rozhraní bude ignorovat -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Hledání min"
 
@@ -2370,7 +2374,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Balík"
 
@@ -3925,35 +3929,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [verze %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Opravdu pokračovat"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Přerušit instalaci"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Náhled instalace balíků"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Zobrazí a/nebo upraví akce, které se mají vykonat"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Některé balíky byly poškozené, ale již jsou spraveny:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "K těmto závislostním problémům neexistuje řešení!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -3962,7 +3966,7 @@
 "Při hledání řešení vypršel povolený čas (stiskem \"%s\" spustíte důkladnější "
 "hledání)."
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -3970,23 +3974,23 @@
 "Instalace/odebrání balíků vyžaduje administrátorská práva, která momentálně "
 "nemáte. Chcete se přepnout na účet root?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Stát se rootem"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Nestát se rootem"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Aktualizace seznamu balíků nebo jejich instalace již probíhá."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Žádné balíky nejsou označeny k instalaci, aktualizaci nebo odstranění."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -3996,7 +4000,7 @@
 "balíky sice mohou být aktualizovány, ale rozhodli jste, že se nemají "
 "aktualizovat. Aktualizaci můžete připravit klávesou \"U\"."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4004,111 +4008,111 @@
 "Aktualizace seznamu balíků vyžaduje administrátorská práva, která momentálně "
 "nemáte. Chcete se přepnout na účet root?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Ukrátit čas hledáním min."
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Čištění během stahování není dovoleno"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Mažu stažené soubory"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Stažené balíky byly smazány"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Staré stažené balíky byly smazány, což uvolnilo %sB místa na disku."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Všechna řešení jsou vyčerpána."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Při hledání řešení vypršel povolený čas."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Nemohu najít řešení, které bych mohl aplikovat."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Nemohu otevřít %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Chyba při ukládání stavu řešitele"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Soubor, do kterého se má uložit stav řešitele:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Instalovat/odstranit balíky"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Provede všechny nevyřízené instalace a odstraňování"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Aktualizovat seznam balíků"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Zjistí, zda nejsou k dispozici novější verze balíků"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Zapomenout nové balíky"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Zapomene, které balíky jsou \"nové\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Vyčistit ^cache s balíky"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Smaže stažené soubory (balíky) z /var/cache/apt"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Vyčistit staré s^oubory"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Smaže soubory, které se již nedají stáhnout"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Označit aktualizovatelné"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Označí všechny aktualizovatelné balíky, které nejsou podrženy"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "Zahrát si minové ^pole"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Stát se rootem"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4116,69 +4120,69 @@
 "Pro přepnutí na uživatele root spusťte 'su'. Tím se program restartuje, ale "
 "všechna nastavení budou zachována"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "Znovu načíst cache"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Znovu načíst obsah cache"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "Konec"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Vrátí zpět poslední operaci nebo skupinu operací s balíky"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instalovat"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Označí aktuálně vybraný balík pro instalaci nebo aktualizaci"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "Odst^ranit"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Označí aktuálně vybraný balík pro odstranění"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "Vyčistit"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Označí aktuálně vybraný balík pro odstranění včetně konfiguračních souborů"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "Ponechat"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Na vybraném balíku zruší veškeré akce"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "Přidržet"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4186,11 +4190,11 @@
 "Na vybraném balíku zruší veškeré akce a ochrání jej před budoucími "
 "aktualizacemi."
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Spravovat ^automaticky"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4198,11 +4202,11 @@
 "Označí vybraný balík, jako instalovaný automaticky; pokud na něm nebudou "
 "záviset jiné balíky, bude automaticky odstraněn."
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Spravovat ručně"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4210,11 +4214,11 @@
 "Označí vybraný balík, jako by byl nainstalován ručně; takový balík nebude "
 "odstraněn, dokud jej neodstraníte sami"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "Zakázat ^verzi"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4222,203 +4226,203 @@
 "Zakáže, aby se nainstalovala kandidátská verze balíku; novější verze balíku "
 "se budou instalovat jako obvykle"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformace"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Pro vybraný balík zobrazí další informace"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "U vybraného balíku zobrazí seznam změn provedených správcem balíku"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "Hledat"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Hledá balík"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Hledat znovu"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Zopakuje poslední hledání"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "Omezit zobrazení"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Na seznam balíků aplikuje výběrový filtr"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "Zrušit omezení"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Odstraní filtr aplikovaný na seznam balíků"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Hledat porušené"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hledá další balík s nesplněnými závislostmi"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Nastavení zobrazení"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Změní nastavení, která ovlivňují uživatelské rozhraní"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Změní nastavení, která ovlivňují způsob řešení závislostí"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "Různé"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Změní ostatní nastavení programu"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "Původní nastavení"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Vrátí všechna nastavení do původního stavu"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "Další"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Zobrazí další pohled"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Předchozí"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Zobrazí předchozí pohled"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "Zavřít"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Zavře tento pohled"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "No^vý pohled na balíky"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Vytvoří nový standardní pohled na balíky"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nový prohlížeč kategorií"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Prohlíží balíky podle kategorií"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "O progr^amu"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Zobrazí informace o programu"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "Nápověda"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Zobrazí on-line nápovědu"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "Uživatelský ^manuál"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Zobrazí podrobný manuál tohoto programu"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Zobrazí seznam často kladených otázek"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^NOVINKY"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Zobrazí důležité změny mezi jednotlivými verzemi "
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Zobrazí podmínky, za kterých můžete program šířit"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Akce"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Hledat"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Volby"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Pohledy"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4426,11 +4430,11 @@
 msgstr ""
 "%s: Menu  %s: Nápověda  %s: Konec  %s Aktualizace  %s Stažení/Instalace"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "ano_key"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "ne_key"
 
@@ -4500,7 +4504,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au! Dostal mě SIGQUIT, umírám..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/da.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/da.po	(original)
+++ branches/aptitude-0.3/aptitude/po/da.po	Wed Jul  6 22:10:50 2005
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.5-2\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2004-10-03 11:19+0200\n"
 "Last-Translator: Morten Bo Johansen <mojo at mbjnet.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -929,66 +929,70 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Følgende pakker har uopfyldte afhængigheder:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Følgende pakker er BRUDTE:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Kunne ikke åbne %s til skrivning"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Fejl ved skrivning til tilstandsfil"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ugyldigt svar. Anfør en gyldig kommando eller \"?\" for hjælp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ugyldigt svar. Anfør en gyldig kommando eller \"?\" for hjælp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "søg: du skal indtaste mindst én søgeterm\n"
@@ -1288,7 +1292,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Kunne ikke tømme kataloger for lister"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter hentede filer som er forældede"
 
@@ -2189,7 +2193,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Minestryger"
 
@@ -2399,7 +2403,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pakke"
 
@@ -3995,45 +3999,45 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Versioner"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Fortsæt"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Forhåndsvisning af pakkeinstallering"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Vis og/eller korrigér de handlinger der skal udføres"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^Forrige"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Visse pakkeafhængigheder var brudte og er blevet repareret"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Spild tid mens du prøver at finde miner"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4042,23 +4046,23 @@
 "Installering/afinstallering af pakker kræver administrative rettigheder,\n"
 "som du ikke har lige nu. Vil du ændre bruger til root?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Bliv root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Bliv ikke root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "En opdatering af pakkelister/installeringskørsel foregår allerede."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4070,7 +4074,7 @@
 "Visse pakker kunne opgraderes, men du har valgt ikke at opgradere dem.\n"
 "Tast \"U\" for at igangsætte en opgradering."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4079,112 +4083,112 @@
 "Opdatering af pakkelisterne kræver administrative rettigheder,\n"
 "som du ikke har lige nu. Vil du ændre bruger til root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Spild tid mens du prøver at finde miner"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Tømning er ikke tilladt mens der hentes filer"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Sletter hentede filer"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Hentede pakkefiler er blevet slettet"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Hentede, forældede pakkefiler er blevet slettet"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Spild tid mens du prøver at finde miner"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Kunne ikke åbne %s til skrivning"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Installér/afinstallér pakker"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Udfør alle afventende installeringer og afinstalleringer"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Opdatér pakkeliste"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Check efter nye versioner af pakker"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Glem nye pakker"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker der er \"nye\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Tøm pakkecache"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Slet tidligere hentede pakkefiler"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Slet ^forældede filer"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slet pakkefiler som ikke længere kan hentes"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "^Marker opgradérbare"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle ikke-tilbageholdte pakker til opgradering"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Spil minestryger"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Bliv ^root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4193,69 +4197,69 @@
 "Kør \"su\" for at blive root. Dette vil genstarte programmet, men dine\n"
 "indstillinger vil blive bevaret"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Genindlæs pakkecache"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Genindlæs pakkecachen"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Afslut"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Afslut programmet"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Fortryd den sidste pakkehandling eller gruppe af handlinger"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Installér"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Markér den aktuelt valgte pakke til installering eller opgradering"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Afinstallér"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Markér den aktuelt valgte pakke til afinstallering"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Udrens"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Markér den aktuelt valgte pakke og dens opsætningsfiler til afinstallering"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Fortryd alle handlinger på den valgte pakke"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Tilbagehold"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4263,11 +4267,11 @@
 "Fortryd alle handlinger på den valgte pakke og beskyt den mod\n"
 "fremtidige opgraderinger"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Markér a^uto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4277,11 +4281,11 @@
 "den vil blive afinstalleret automatisk hvis ingen andre pakker\n"
 "afhænger af den"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Markér ^manuel"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4290,11 +4294,11 @@
 "Markér den valgte pakke som værende manuelt installeret;\n"
 "den vil ikke blive afinstalleret, medmindre du gør det manuelt"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Forbyd version"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4303,204 +4307,204 @@
 "Forbyd at kandidat-versionen af den valgte pakke bliver installeret;\n"
 "nyere versioner af pakken vil blive installeret som sædvanlig"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "^Oplysning"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Vis flere oplysninger om den valgte pakke"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Programændringer"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians logfil over programændringer for den valgte pakke"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Find"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Søg efter en pakke"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Find ^igen"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Gentag sidste søgning"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Afgræns visning"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Anvend et filter på pakkelisten"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Uafgrænset visning"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Fjern filteret fra pakkelisten"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Find ^brudte"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Find næste pakke med uopfyldte afhængigheder"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^Brugergrænseflade"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Ændr indstillinger som påvirker brugergrænsefladen"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Afhængigheder"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Ændr indstillinger som påvirker håndteringen af pakkeafhængigheder"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Diverse"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Ændr diverse programindstillinger"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Nulstil indstillinger"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Nulstil alle indstillinger til systemets forvalgte"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Næste"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Vis næste skærmbillede"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Forrige"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Vis forrige skærmbillede"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Luk"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Luk dette skærmbillede"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Ny pakke^oversigt"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Lav en ny standard for pakkeoversigt"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Ny ^kategorivisning"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Vis pakker efter kategori"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Vis information om dette program"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Hjælp"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Læs online-hjælpen"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Brugervejledning"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Vis den detaljerede program-manual"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over ofte stillede spørgsmål"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Vis vigtige ændringer lavet i hver version af programmet"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licens"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Læs betingelserne for kopiering af dette program"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Søg"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Indstillinger"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Skærmbilleder"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4508,11 +4512,11 @@
 msgstr ""
 "%s: Menu  %s: Hjælp  %s: Afslut  %s: Opdatér  %s: Hent/Installér/Afinstallér"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "ja_taste"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "nej_taste"
 
@@ -4584,7 +4588,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Av! Modtog SIGQUIT, dør ..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/de.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/de.po	(original)
+++ branches/aptitude-0.3/aptitude/po/de.po	Wed Jul  6 22:10:50 2005
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.5\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-21 11:38GMT\n"
 "Last-Translator: Dennis Stampfer <seppy at debian.org>\n"
 "Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
@@ -941,70 +941,74 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Die folgenden Pakete haben verletzte Abhängigkeiten:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Die folgenden Pakete sind KAPUTT:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "%s konnte nicht zum schreiben geöffnet werden"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Fehler beim Schreiben der Statusdatei"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Ungültige Antwort.  Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe "
 "ein.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Ungültige Antwort.  Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe "
 "ein.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: Sie müssen einen Suchbegriff angeben\n"
@@ -1311,7 +1315,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Konnte Listenverzeichnisse nicht aufräumen"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Lösche veraltete heruntergeladene Dateien"
 
@@ -2235,7 +2239,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Minesweeper"
 
@@ -2480,7 +2484,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paket"
 
@@ -4091,45 +4095,45 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Versionen"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Weiter"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Vorschau der Paketinstallation"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Anzeigen und anpassen der geplanten Aktionen"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^Vorherige"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Manche Pakete waren kaputt und wurden repariert"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Zeit verschwenden (Minensuchspiel)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4138,25 +4142,25 @@
 "Zum Installieren/Entfernen von Paketen sind Administrationsrechte nötig,\n"
 "die Sie derzeit nicht haben.  Wollen Sie zum root-Account wechseln?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "»root« werden"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Nicht »root« werden"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Ein Aktualisierungs oder Installationsvorgang findet gerade statt."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Es wurden keine Pakete zum Installieren, Entfernen oder Aktualisieren "
 "ausgewählt."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4169,7 +4173,7 @@
 "ausgewählt.\n"
 "Geben Sie »Umschalt+U« ein, um diese Pakete zu aktualisieren."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4178,118 +4182,118 @@
 "Zum Aktualisieren der Paketliste sind Administrationsrechte nötig,\n"
 "die Sie derzeit nicht haben.  Wollen Sie zum root-Account wechseln?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Zeit verschwenden (Minensuchspiel)"
 
 #  Erk!  That's weird!
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Aufräumen, während ein Download läuft, ist nicht erlaubt"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Lösche heruntergeladene Dateien"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Heruntergeladene Dateien wurden gelöscht"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Veraltete heruntergeladene Paketdateien wurden gelöscht"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Zeit verschwenden (Minensuchspiel)"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "%s konnte nicht zum schreiben geöffnet werden"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Installieren/Entfernen von Paketen"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Durchführen geplanter Installations- und Löschvorgänge"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "Paketliste ^aktualisieren"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Nach neuen oder aktualisierten Paketen suchen"
 
 #  FIXME: this is a bad name for the menu item.
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "Neue Pakete ^vergessen"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Vergessen, welche Pakete »neu« sind"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Paketcache komplett ^leeren"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Alle Paketdateien aus dem Paketcache löschen"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Nur ^veraltete Paketdateien löschen"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 "Nur solche Paketdateien aus dem Cache löschen,\n"
 "die nicht mehr heruntergeladen werden können"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Aktualisierbare ^markieren"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Alle aktualisierbaren Pakete, die nicht zurückgehalten werden, zum Upgrade "
 "markieren"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Minesweeper spielen"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Root werden"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4298,69 +4302,69 @@
 "'su' ausführen um root zu werden.  Dies wird das Programm neu starten, aber\n"
 "Ihre Einstellungen werden erhalten bleiben."
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "Paketcache ^neu laden"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Paketcache neu laden"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Beenden"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Aptitude verlassen"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Die letzte Operation oder Gruppe von Operationen rückgängig machen"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Installieren"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Das ausgewählte Paket zur Installation oder zum Upgrade auswählen"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Entfernen"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Das ausgewählte Paket zum Entfernen auswählen"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Vollständig entfernen"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Das ausgewählte Paket und seine Konfigurationsdateien zum Entfernen markieren"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Beibehalten"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Alle Aktionen mit dem gewählten Paket zurücknehmen"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Zurückhalten"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4368,11 +4372,11 @@
 "Geplante Vorgänge mit dem gewählten Paket zurücknehmen und\n"
 "es vor zukünftigen Upgrades schützen"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Als ^automatisch markieren"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4382,11 +4386,11 @@
 "es wird dann automatisch gelöscht, wenn keine anderen Pakete mehr davon "
 "abhängen"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Als ^manuell markieren"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4395,11 +4399,11 @@
 "Dieses Paket als manuell installiert markieren;\n"
 "es wird dann nur noch auf Ihren Wunsch hin gelöscht."
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "Version verbieten"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4409,206 +4413,206 @@
 "noch neuere Versionen werden wie üblich installiert werden"
 
 # ummmm...
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "Informationen"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Mehr Informationen zum gewählten Paket"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Das Debian-Änderungsprotokoll für das gewählte Paket anzeigen"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Suchen"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Nach einem Paket suchen"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "^Weitersuchen"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Die letzte Suche wiederholen"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Filtern des Paketbaums"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Einen Filter auf die Paketliste anwenden"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Löschen des Filters"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Die Paketliste nicht mehr filtern"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Kaputtes Paket suchen"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Das nächste Paket mit verletzten Abhängigkeiten finden"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^Oberfläche"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Einstellungen verändern, die die Benutzeroberfläche betreffen"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Abhängigkeisbehandlung"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Einstellungen verändern, die die Handhabung von Abhängigkeiten betreffen"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Verschiedenes"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Sonstige Programmeinstellungen ändern"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Optionen zurücksetzen"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Alle Einstellungen auf die Vorgabewerte zurücksetzen"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Nächste"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Nächste Ansicht zeigen"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Vorherige"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Vorherige Ansicht zeigen"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Schließen"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Ansicht schließen"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Neue Paket^ansicht"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Eine neue Paketansicht erzeugen"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Neuen Kategorie-^Browser"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Pakete nach Kategorie durchsuchen"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "Ü^ber"
 
 # ummmm...
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Information über Aptitude"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "K^urzhilfe"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Kurzhilfe zu Aptitude"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Anleitung"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Die detaillierte Anleitung (README, derzeit nur englisch)"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Die Liste häufig gestellter Fragen (Frequently Asked Questions, FAQ)"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Protokoll der Änderungen, die an Aptitude vorgenommen wurden"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "Lizen^z"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Die Bedingungen, unter denen Sie Aptitude kopieren dürfen"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Suchen"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Optionen"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Ansichten"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4617,11 +4621,11 @@
 "%s: Menü  %s: Hilfe  %s: Beenden  %s: Update  %s: Download/Installieren/"
 "Entf. von Paketen"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "n"
 
@@ -4694,7 +4698,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Aua!  SIGQUIT erhalten, sterbe...\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/el.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/el.po	(original)
+++ branches/aptitude-0.3/aptitude/po/el.po	Wed Jul  6 22:10:50 2005
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_po_el\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-04-03 14:02EEST\n"
 "Last-Translator: Greek Translation Team <debian-l10n-greek at lists.debian."
 "org>\n"
@@ -963,68 +963,72 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Σφάλμα κατά την εγγραφή στο αρχείο κατάστασης"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Ακυρη απάντηση.  Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Ακυρη απάντηση.  Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "αναζήτηση: Θα πρέπει να ορίσετε ένα τουλάχιστον αντικείμενο\n"
@@ -1324,7 +1328,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Αδύνατο ο καθαρισμός του φακέλου της λίστας"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Διαγράφονται τα περιττά μεταφορτωμένα αρχεία"
 
@@ -2257,7 +2261,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Ναρκαλιευτής"
 
@@ -2471,7 +2475,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Πακέτο"
 
@@ -4095,44 +4099,44 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Εκδόσεις"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Χωρίς πλάκα, συνέχεια"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Εγκατάλειψη εγκατάστασης"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Προεπισκόπηση της εγκατάστασης των πακέτων"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Εμφάνιση και/ή ρύθμιση των ενεργειών που θα εκτελεστούν"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^Προηγ"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Κάποια πακέτα ήταν κατεστραμμένα και έχουν διορθωθεί"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Σκοτώστε την ώρα σας βρίσκοντας νάρκες"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4141,23 +4145,23 @@
 "Η εγκατάσταση/αφαίρεση πακέτων απαιτεί προνόμια διαχειριστή, που δεν\n"
 "έχετε αυτή τη στιγμή.  Θα θέλατε να συνδεθείτε ως χρήστης root;\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Μετατροπή σε root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Οχι μετατροπή σε root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Ήδη βρίσκεται σε εξέλιξη μια διαδικασία αναβάθμισης ή εγκατάστασης."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Δεν έχουν επιλεγεί πακέτα για εγκατάσταση, αφαίρεση ή αναβάθμιση."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4170,7 +4174,7 @@
 "αναβαθμίσετε.\n"
 "Πληκτρολογήστε \"U\" για να προετοιμάσετε μια αναβάθμιση."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4179,114 +4183,114 @@
 "Η ενημέρωση των λιστών πακέτων απαιτεί προνόμια διαχειριστή, που δεν\n"
 "έχετε αυτή τη στιγμή.  Θα θέλατε να συνδεθείτε ως χρήστης root;\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Σκοτώστε την ώρα σας βρίσκοντας νάρκες"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Δεν επιτρέπεται εκκαθάριση κατά τη διάρκεια της μεταφόρτωσης"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Διαγράφονται τα μεταφορτωμένα αρχείων"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Τα μεταφορτωμένα αρχεία έχουν διαγραφεί"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Τα περιττά μεταφορτωμένα αρχεία έχουν διαγραφεί"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Σκοτώστε την ώρα σας βρίσκοντας νάρκες"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Εγκατάσταση/Αφαίρεση πακέτων"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Ολοκλήρωση όλων των εκκρεμών εγκαταστάσεων/αφαιρέσεων"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Ενημέρωση της λίστας πακέτων"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Έλεγχος για νέες εκδόσεις πακέτων"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "Ξέχασε τα νέα πακέτα"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Ξέχασε τα πακέτα που είναι \"νέα\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Εκκαθάριση του cache των πακέτων"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Διαγραφή των αρχείων πακέτου που έχουν μεταφορτωθεί προηγουμένως"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Εκκαθάριση ^περιττών αρχείων"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Διαγραφή των αρχείων πακέτων που δεν μπορούν πλέον να μεταφορτωθούν"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Σημείωση ^Αναβαθμιζομένων"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Σημείωση όλων των αναβαθμιζομένων πακέτων που δεν κρατούνται πλέον για "
 "αναβάθμιση"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "Παίξε Ναρκαλιευτή"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Σύνδεση ως root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4295,69 +4299,69 @@
 "Εκτελέστε την εντολή 'su' για να συνδεθείτε ως root.  Αυτή θα ξαναεκτελέσει\n"
 "το πρόγραμμα διατηρώντας τις δικές σας ρυθμίσεις"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "Επαναφόρτωση του cache πακέτων"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Επαναφόρτωση του cache των πακέτων"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "Έξοδος"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Έξοδος από το πρόγραμμα"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Αναίρεση"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Επαναφορά της τελευταίας εργασίας ή ομάδας εργασιών σε πακέτο."
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Εγκατάσταση"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Σήμανση του τρέχοντος πακέτου για εγκατάσταση ή αναβάθμιση"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Αφαίρεση"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Σήμανση του τρέχοντος πακέτου για αφαίρεση"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Διαγραφή"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Σήμανση του τρέχοντος πακέτου και των αρχείων ρυθμίσεών του για αφαίρεση"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Κράτηση"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Ακύρωση κάθε ενέργειας για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Αναμονή"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4365,11 +4369,11 @@
 "Ακύρωση κάθε ενέργειας για το επιλεγμένο πακέτο, και προστασία του από "
 "μελλοντικές αναβαθμίσεις"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "^Αυτόματη Σήμανση"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4378,11 +4382,11 @@
 "Σήμανση του επιλεγμένου πακέτου ως αυτόματα εγκατεστημένου. \n"
 "έτσι θα αφαιρεθεί αυτόματα όταν δεν θα εξαρτώνται άλλα πακέτα από αυτό."
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "^Χειροκίνητη Σήμανση"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4391,11 +4395,11 @@
 "Σήμανση των επιλεγμένων πακέτων ως χειροκίνητα εγκατεστημένων. \n"
 "δεν θα αφαιρεθούν εκτός και αν τα αφαιρέσετε εσείς χειροκίνητα."
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Απαγόρευση έκδοσης"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4405,216 +4409,216 @@
 "εγκατασταθεί\n"
 "νεώτερες εκδόσεις του, θα εγκατασταθούν κανονικά"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "Π^ληροφορίες"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Εμφάνισε περισσότερες πληροφορίες για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "Α^ρχείο Αλλαγών"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Εμφάνισε το ημερολόγιο αλλαγών του Debian για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Ευρεση"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Αναζήτηση για ένα πακέτο"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Βρές ^Ξανά"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Επανάληψη της τελευταίας αναζήτησης"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Περιόρισε Εμφάνιση"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Εφαρμογή φίλτρου στον κατάλογο των πακέτων"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Εμφάνιση Χωρίς Περιορισμούς"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Αφαίρεση του φίλτρου από τον κατάλογο των πακέτων"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Βρές Σ^πασμένο"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Βρες το επόμενο πακέτο με ανεπίλυτες εξαρτήσεις"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Επιλογές ^Περιβάλλοντος"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Αλλαγή των επιλογών που μεταβάλουν το περιβάλλον εργασίας"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Διαχείριση Εξαρτήσεων"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Αλλαγή των ρυθμίσεων που επηρεάζουν τη διαχείριση των εξαρτήσεων των πακέτων"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Διάφορα"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Αλλαγή διαφόρων επιλογών του προγράμματος"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Επαναφορά επιλογών"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Ορισμός όλων των επιλογών στις προκαθορισμένες τιμές"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Επόμενο"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Εμφάνιση επόμενης οθόνης"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Προηγ"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Εμφάνιση προηγούμενης οθόνης"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Κλείσιμο"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Κλείσιμο αυτής της οθόνης"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Νέα Εμφάνιση ^Πακέτου"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Δημιουργία νέας οθόνης εμφάνισης πακέτου"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Εμφάνιση Νέας Κατηγοριοποίησης"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Εμφάνιση πακέτων ανά κατηγορία"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "Σχετικά"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Εμφάνιση πληροφορίας σχετικά με το πρόγραμμα"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Βοήθεια"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Εμφάνιση της βοήθειας του προγράμματος"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "Οδηγίες ^Χρήσης"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Εμφάνιση των αναλυτικών οδηγιών χρήσης"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Εμφάνιση των πιο συχνών ερωτήσεων"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Εμφάνιση των σημαντικών αλλαγών σε κάθε έκδοση του προγράμματος"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "Άδεια ^χρήσης"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Εμφάνιση των όρων χρήσης και διανομής του του προγράμματος"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Επιλογές"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Οθόνες"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr "%s: Μενού %s: Βοήθεια %s: Έξοδος %s: Ενημέρωση %s: Εργασίες Πακέτων"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "Ν"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "Ο"
 
@@ -4685,7 +4689,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ωχ!  Έλαβα το σήμα SIGQUIT, έφυγα..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/es.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/es.po	(original)
+++ branches/aptitude-0.3/aptitude/po/es.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.3.2-4\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-07-05 13:43+0200\n"
 "Last-Translator: Rubén Porras Campo <nahoo at inicia.es>\n"
 "Language-Team: Debian-l10n-Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -946,65 +946,69 @@
 "Los ajustes harán que la solución actual se descarte y se recalcule según "
 "sea necesario"
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Las acciones siguientes resolverán estas dependencias"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "¿Acepta esta solución? [Y/n/q/?]"
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Abandonando todos los esfuerzos por resolver estas dependencias"
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Las siguientes órdenes están disponibles:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Fichero en el que escribir el estado del solucionador:"
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "No se pudo abrir %s para escribir en él"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Error al escribir el estado del solucionador a %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Respuesta inválida. Por favor, introduzca una de las órdenes siguientes:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 "No se encontró ninguna solución en el tiempo asignado. ¿Intentarlo "
 "conzienzudamente? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Respuesta inválida. Por favor, introduzca 'y' o 'n'."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "¡Incapaz de resolver las dependencias! Desistiendo..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "No hay más soluciones"
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr "falló iconv sobre %s.\n"
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "búsqueda: Debe proporcionar al menos una término de búsqueda\n"
@@ -1306,7 +1310,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "No se pudo borrar los directorios de lista"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Borrando los ficheros descargados ya obsoletos"
 
@@ -2249,7 +2253,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Aviso: la interfaz visual ignorará -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Buscaminas"
 
@@ -2459,7 +2463,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paquete"
 
@@ -2668,7 +2672,9 @@
 #: src/pkg_columnizer.cc:651 src/pkg_columnizer.cc:660
 #, c-format
 msgid "Unable to transcode package display format after \"%ls\""
-msgstr "Incapaz de cambiar la codificación del formato de muestra de los paquetes después de \"%ls\""
+msgstr ""
+"Incapaz de cambiar la codificación del formato de muestra de los paquetes "
+"después de \"%ls\""
 
 #: src/pkg_columnizer.cc:667
 msgid "Internal error: Default column string is unparsable"
@@ -4065,35 +4071,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versión %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Continúa de todas formas"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Aborta la instalación"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Pre-visualización de la instalación de los paquetes"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ver y/o ajustar las acciones que se realizarán"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Algunos paquetes estaban rotos y se han arreglado:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "¡No existe ninguna solución para estos problemas de dependencias!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4102,7 +4108,7 @@
 "Se agotó el tiempo tratando de resolver las dependencias (presione \"%s\" "
 "para intentarlo concienzudamente)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4111,26 +4117,26 @@
 "administración, que actualmente no tiene. ¿Desearía cambiar a la cuenta de "
 "administrador?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Convertirse en administrador"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "No convertirse en administrador"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Ya está teniendo lugar una actualización de la lista de paquetes o una "
 "instalación."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "No hay ningún paquete planificado para instalar, eliminar o actualizar."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4140,7 +4146,7 @@
 "pueden actualizarse, pero ha elegido no actualizarlos. Escriba \"U\" para "
 "preparar una actualización."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4149,23 +4155,23 @@
 "administración, que actualmente no tiene. ¿Desearía cambiar a la cuenta de "
 "administrador?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Pierda su tiempo intentando buscar las minas"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "No está permitido limpiar mientras se esté realizando una descarga"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Eliminando ficheros descargados"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Se han borrado los ficheros de paquetes descargados"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -4174,90 +4180,90 @@
 "Se han borrado los ficheros de paquetes descargados obsoletos, liberando %sB "
 "de espacio en disco."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Se agotaron todas las soluciones."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Se agotó el tiempo al intentar buscar una solución."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "No se pudo encontrar una solución aplicable."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, c-format
 msgid "Unable to open %ls"
 msgstr "No se pudo abrir %ls"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Error las volcar el estado del solucionador"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Fichero al que se debe volcar de el estado del solucionador:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Instalar/eliminar paquetes"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Realizar todas las instalaciones y eliminaciones pendientes"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Actualizar la lista de paquetes"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Buscar nuevas versiones de los paquetes"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Olvidar paquetes nuevos"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Olvidar que paquetes son «nuevos»"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Limpiar la caché de paquetes"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Borra los ficheros de paquetes descargados previamente"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Limpiar ficheros ^obsoletos"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Borra los ficheros de paquetes que ya no pueden ser descargados"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Marcar ^actualizable"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 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/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Jugar al buscaminas"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Convertirse en administrador"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4265,70 +4271,70 @@
 "Ejecuta 'su' para convertirse en administrador. Esto reiniciará el programa "
 "pero se mantendrán sus preferencias."
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Recargar la caché de paquetes"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Recarga la caché de paquetes"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Salir"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Deshacer"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Deshacer la última operación o grupo de operaciones sobre los paquetes"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marcar el paquete seleccionado actualmente para instalar o actualizar"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Eliminar"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar el paquete seleccionado actualmente para eliminar"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marcar el paquete seleccionado actualmente y sus ficheros de configuración "
 "para eliminar"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Mantener"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar cualquier acción en el paquete seleccionado"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Retener"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4336,11 +4342,11 @@
 "Cancelar cualquier acción en el paquete seleccionado, y protejerlo de "
 "futuras actualizaciones"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Marcar ^automático"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4348,11 +4354,11 @@
 "Marcar el paquete seleccionado como instalado automáticamente. Se eliminará "
 "automáticamente si ningún otro paquete depende de él"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Marcar ^manual"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4360,11 +4366,11 @@
 "Marcar el paquete seleccionado como instalado manualmente. No se eliminará a "
 "menos que lo haga manualmente"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Prohíbir versiones"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4372,217 +4378,219 @@
 "Evitar que se instale la versión candidata del paquete seleccionado. Las "
 "versiones posteriores del paquete se instalaran de la forma usual"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "^Información"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Mostrar más información acerca del paquete seleccionado"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Registro de cambios"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar el registro de cambios del paquete seleccionado"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Buscar"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Buscar un paquete"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Buscar otra ^Vez"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Repetir la última búsqueda"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Limitar vista"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Aplicar un filtro a la lista de paquetes"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^No limitar vista"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Eliminar el filtro de la lista de paquetes"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Buscar ^Roto"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontrar el siguiente paquete con dependencias insatisfechas"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Opciones de la ^IU"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Cambiar las preferencias que afectan a la interfaz de usuario"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Manejo de ^dependencias"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Cambiar las preferencias que afectan como se gestionan las dependencias de "
 "paquetes"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Miscelánea"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Cambiar diversas preferencias del programa"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Deshacer opciones"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Fijar todas las preferencias en los valores predeterminados"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Siguiente"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Ver siguiente pantalla"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Prev"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Ver pantalla anterior"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Cierra"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Cerrar esta pantalla"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nueva ^vista de paquetes"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Crear una nueva vista de paquetes por defecto"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nuevo ^navegador de categorías"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Navegar paquetes por categorías"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Acerca de"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Ver información sobre este programa"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Ayuda"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Ver la ayuda en línea"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Manual de usuario"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Consultar el manual detallado del programa"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^PUF"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Ver una lista de preguntas frecuentes"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^NOTICIAS"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr ""
 "Ver los cambios más importantes realizados en cada versión del programa"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Consultar los términos bajo los que puede copiar este programa"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Buscar"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opciones"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
-msgstr "%ls: Menú %ls: Ayuda %ls: Salir %ls: Actualizar %ls: Descarga/Instala/Elimina Paqs"
+msgstr ""
+"%ls: Menú %ls: Ayuda %ls: Salir %ls: Actualizar %ls: Descarga/Instala/"
+"Elimina Paqs"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "sí"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "no"
 
@@ -4653,7 +4661,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "¡Argh!  Recibido SIGQUIT, terminando..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/eu.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/eu.po	(original)
+++ branches/aptitude-0.3/aptitude/po/eu.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude.eu3\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-14 13:06+0200\n"
 "Last-Translator: Iñaki Larrañaga <dooteo at euskalgnu.org>\n"
 "Language-Team:  <itzulpena at euskalgnu.org>\n"
@@ -932,62 +932,66 @@
 "Egokitzeak uneko irtenbidea baztertzea, eta beharrezkoak diren kalkuluak "
 "berriro egitea dakar."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Honako ekintzek mendekotasun hauek konponduko dituzte:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Onartu irtenbide hau? [Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Mendekotasun hauek ebazteko ahalegin guztiak bertan behera uzten."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Honako komandoak eskuragarri daude:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Fitxategia ebazpen-egoera idazteko:"
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Ezin da %s idazteko ireki"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Errorea ebazpen-egoera %s(e)n idaztean"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Erantzun baliogabea. Sartu hurrengo komendoetariko bat:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "Ez da irtenbiderik aurkitu emandako denboran. Sakonago saiatu? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Erantzun baliogabea. Sakatu 'y' edo 'n'."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Ezin da mendekotasunak ebatzi. Bertan behera uzten..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Ez dago irtenbide gehiagorik."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "bilatu: bilaketa-termino bat eman behar duzu gutxienez\n"
@@ -1287,7 +1291,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Ezin izan dira zerrenda-direktorioak garbitu"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Zaharkitutako deskargatutako fitxategiak ezabatzen"
 
@@ -2217,7 +2221,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Abisua: interfaze bisualak '-s/Cmdline::Simulate' ez ikusi egingo du\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Mina-aurkitzailea"
 
@@ -2425,7 +2429,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paketea"
 
@@ -4020,35 +4024,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [%s bertsioa]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Jarraitu benetan"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Bertan behera utzi instalazioa"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Pakete-instalazioaren aurrebista"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ikusi edota egokitu landuko diren ekintzak"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Aurrebista"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Zenbait pakete hautsita zeuden eta konpondu egin dira:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Ez dago irtenbiderik mendekotasun arazoari aurre egiteko."
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4057,7 +4061,7 @@
 "Denboraz kanpo mendekotasunak ebazten saiatzean (sakatu \"%s\" sakonago "
 "saiatzeko)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4065,24 +4069,24 @@
 "Paketeak instalatu/kendu ahal izateko, administratzaile-pribilegioak behar "
 "dira, eta zuk ez daukazu horrelakorik. Root kontura aldatu nahi duzu?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Root bihurtu"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Ez bihurtu root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Pakete-zerrenda baten eguneratzea edo instalazioa dagoeneko egiten ari da."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ez dago instalatzeko, kentzeko edo bertsio-berritzeko paketerik."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4092,7 +4096,7 @@
 "bertsio-berri daitezke, baina ez duzu berritzea aukeratu. Bertsio-berritze "
 "bat prestatzeko, idatzi \"U\"."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4100,23 +4104,23 @@
 "Pakete-zerrendak eguneratzeko, administratzaile-pribilegioak behar dira, eta "
 "zuk ez daukazu horrelakorik. Root kontura aldatu nahi duzu?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Denbora pasa mina bila"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Deskarga bat egiten ari den bitartean ezin da garbitu"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Deskargatutako fitxategiak ezabatzen"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Deskargatutako pakete-fitxategiak ezabatu egin dira"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -4125,88 +4129,88 @@
 "Deskargatutako pakete-fitxategi zaharkituak ezabatu egin dira, diskotik %sB "
 "libre uzten."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "irtenbide guztiak agortu dira."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Denboraz kanpo irtenbide bat bilatzen saiatzean."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Ezin izan da irtenbiderik aurkitu aplikatzeko."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Ezin izan da %s ireki"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Errorea ebazpen-egoera iraultzean"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Fitxategia ebazpen-egoera iraultzeko:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Instalatu/kendu paketeak"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Instalatzeko/kentzeko dauden pakete guztiak instalatu/kendu"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Eguneratu pakete-zerrenda"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Paketeen bertsio berririk dagoen begiratu"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Ahaztu pakete berriak"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Ahaztu zein diren pakete \"berriak\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Garbitu paketeen cachea"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Lehen deskargatutako pakete-fitxategiak ezabatu"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Garbitu fitxategi ^zaharkituak"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Jada deskargatu ezin diren pakete-fitxategiak ezabatu"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Markatu ^Berritu daitekeena"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Bertsio-berritu daitezkeen paketeak, atxikita ez daudenak, markatu"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Jokatu mina-aurkitzailean"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Root bihurtu"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4214,71 +4218,71 @@
 "Root bihurtzeko, exekutatu 'su'. Horrela programa berrabiaraziko da, baina "
 "zure ezarpenak mantenduta."
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Birkargatu pakete-cachea"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Paketeen cachea birkargatu."
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Irten"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Irten programatik"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Desegin"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Azken pakete-eragiketa edo eragiketa-multzoa desegin"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instalatu"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Jarri bandera unean hautatutako paketeei, instalatzeko edo bertsio-berritzeko"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Kendu"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Jarri bandera unean hautatutako paketeei, kentzeko"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Purgatu"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Jarri bandera unean hautatutako paketeei eta beraien konfigurazioko "
 "fitxategiei, kentzeko"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Mantendu"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Bertan behera utzi hautatutako paketeen ekintza"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Heldu"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4286,11 +4290,11 @@
 "Bertan behera utzi hautattutako paketearen ekintza, eta babestu etorkizuneko "
 "bertsio-berritzetik."
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Markatu ^Auto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4298,11 +4302,11 @@
 "Markatu hautatutako paketea automatikoki instalatu balitz bezala;beste "
 "paketerik behar ez duenean automatikoki ezabatua izango da"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Markatu ^Eskuz"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4310,11 +4314,11 @@
 "Markatu hautatutako paketea eskuz instalatua izan balitz bezala; ez da "
 "ezabatuko zuk eskuz ezabatu arte"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Debekatutako bertsioa"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4322,205 +4326,205 @@
 "Debekatu hautatutako paketearen bertsioa instalatzea;\n"
 "bertsio berriagoak era arruntean kudeatuko dira"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformazioa"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Bistaratu hautatutako paketeari buruzko informazio xehea"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Aldaketa-egunkaria"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Bistaratu hautatutako paketearen Debian-eko aldakaten egunkaria"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Bilatu"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Bilatu paketea"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Bilatu be^rriro"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Errepikatu azken bilaketa"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "M^ugatu bistaratzea"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Ezarri iragazkia pakete-zerrendari"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Garbitu bistaratzea"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Kendu iragazkia pakete-zerrendari"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Bilatu ^hautsitakoa"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Bilatu hurrengo paketea, bete gabeko mendekotasunak dituena"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^UI aukerak"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Erabiltzaile-interfazean eragina duten ezarpenak aldatu"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Mendekotasunak maneiatzea"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Pakete-mendekotasunak maneiatzeko moduan eragina duten ezarpenak aldatu"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Hainbat"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Hainbat programa-ezarpen aldatu"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Desegin aukerak"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Leheneratu ezarpen guztiak sistemaren lehenespenetara"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Hurrengoa"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Hurrengo pantaila ikusi"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Aurrekoa"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Aurreko pantaila ikusi"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Itxi"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Pantaila hau itxi"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Pakete ^Ikuspegi berria"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Pakete-ikuspegi lehenetsi berri bat sortu"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Kategoria ^Arakatzaile berri bat"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Paketeak kategoriaka arakatu"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Honi buruz..."
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Programa honi buruzko informazioa ikusi"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Laguntza"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Lineako laguntza ikusi"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "Erabiltzailearen ^Eskuliburua"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Programaren eskuliburu xehatua ikusi"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Maiz egiten diren galderen zerrenda bat ikusi"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^BERRIAK"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr ""
 "Ikusi hurrengoaren bertsio bakoitzean egindako aldaketa garrantzitsuak:"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Lizentzia"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Programa kopiatzeko bete beharreko baldintzak ikusi"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Aukerak"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Ikuspegiak"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Laguntza"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4529,11 +4533,11 @@
 "%s: Menua  %s: Laguntza  %s: Irten  %s: Eguneratu  %s: Deskargatu/Instalatu/"
 "Kendu paketeak"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "bai_gakoa"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "ez_gakoa"
 
@@ -4603,7 +4607,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ene! SIGQUIT jaso dut, amaitzen..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/fi.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/fi.po	(original)
+++ branches/aptitude-0.3/aptitude/po/fi.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.3.2\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-06-12 22:42+0200\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-29 12:59+0300\n"
 "Last-Translator: Jaakko Kangasharju <ashar at iki.fi>\n"
 "Language-Team: Jaakko Kangasharju <ashar at iki.fi>\n"
@@ -99,7 +99,9 @@
 
 #: src/apt_options.cc:156
 msgid "Remove obsolete package files after downloading new package lists"
-msgstr "Poista vanhentuneet pakettitiedostot uusien pakettiluetteloiden noudon jälkeen"
+msgstr ""
+"Poista vanhentuneet pakettitiedostot uusien pakettiluetteloiden noudon "
+"jälkeen"
 
 #: src/apt_options.cc:158
 msgid "URL to use to download changelogs"
@@ -117,7 +119,8 @@
 #: src/apt_options.cc:167
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
-msgstr "Tyhjennä uusien pakettien ryhmä paketteja asennettaessa tai poistettaessa"
+msgstr ""
+"Tyhjennä uusien pakettien ryhmä paketteja asennettaessa tai poistettaessa"
 
 #: src/apt_options.cc:170
 msgid "Warn when attempting to perform a privileged action as a non-root user"
@@ -147,14 +150,14 @@
 msgid "Automatically remove unused packages matching this filter"
 msgstr "Poista automaattisesti tähän hakuehtoon täsmäävät paketit"
 
-#: src/apt_options.cc:240 src/mine/cmine.cc:249 src/mine/cmine.cc:312
-#: src/ui.cc:215 src/vscreen/vs_util.cc:77 src/vscreen/vs_util.cc:90
-#: src/vscreen/vs_util.cc:264 src/vscreen/vs_util.cc:298
+#: src/apt_options.cc:240 src/mine/cmine.cc:271 src/mine/cmine.cc:334
+#: src/ui.cc:209 src/vscreen/vs_util.cc:78 src/vscreen/vs_util.cc:91
+#: src/vscreen/vs_util.cc:268 src/vscreen/vs_util.cc:304
 msgid "Ok"
 msgstr "Ok"
 
-#: src/apt_options.cc:241 src/download_list.cc:69 src/mine/cmine.cc:250
-#: src/mine/cmine.cc:313 src/vscreen/vs_util.cc:298
+#: src/apt_options.cc:241 src/download_list.cc:81 src/mine/cmine.cc:272
+#: src/mine/cmine.cc:335 src/vscreen/vs_util.cc:305
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -613,13 +616,13 @@
 "ovat kunnollisia.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
-#: src/vscreen/vs_util.cc:202
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:166
+#: src/vscreen/vs_util.cc:204
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:165
-#: src/vscreen/vs_util.cc:202
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:167
+#: src/vscreen/vs_util.cc:205
 msgid "No"
 msgstr "Ei"
 
@@ -729,13 +732,17 @@
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
-msgstr "näytä tiedot yhdestä tai useammasta paketista; kirjoita pakettien nimet 'i':n jälkeen"
+msgstr ""
+"näytä tiedot yhdestä tai useammasta paketista; kirjoita pakettien nimet 'i':"
+"n jälkeen"
 
 #: src/cmdline/cmdline_prompt.cc:647
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
-msgstr "näytä Debianin muutoslokit yhdestä tai useammasta paketista; kirjoita pakettien nimet 'c':n jälkeen"
+msgstr ""
+"näytä Debianin muutoslokit yhdestä tai useammasta paketista; kirjoita "
+"pakettien nimet 'c':n jälkeen"
 
 #: src/cmdline/cmdline_prompt.cc:649
 msgid "toggle the display of dependency information"
@@ -754,12 +761,17 @@
 msgstr "siirry kokoruudun käyttötilaan"
 
 #: src/cmdline/cmdline_prompt.cc:656
+#, fuzzy
 msgid ""
-"You may also specify modifaction to the actions which will be taken.  To do "
+"You may also specify modification to the actions which will be taken.  To do "
 "so, type an action character followed by one or more package names (or "
 "patterns).  The action will be applied to all the packages that you list.  "
 "The following actions are available:"
-msgstr "Voit myös määrittää muutoksia suoritettaviin toimenpiteisiin kirjoittamalla toimintomerkin, jota seuraavat pakettien nimet (tai kaavat).  Toiminto suoritetaan kaikille luettelemillesi paketeille.  Käytössä olevat toiminnot ovat:"
+msgstr ""
+"Voit myös määrittää muutoksia suoritettaviin toimenpiteisiin kirjoittamalla "
+"toimintomerkin, jota seuraavat pakettien nimet (tai kaavat).  Toiminto "
+"suoritetaan kaikille luettelemillesi paketeille.  Käytössä olevat toiminnot "
+"ovat:"
 
 #: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
 msgid "'+' to install packages"
@@ -768,7 +780,8 @@
 #: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
-msgstr "'+M' asentaaksesi paketteja ja merkitäksesi ne automaattisesti asennetuiksi"
+msgstr ""
+"'+M' asentaaksesi paketteja ja merkitäksesi ne automaattisesti asennetuiksi"
 
 #: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
 msgid "'-' to remove packages"
@@ -909,59 +922,71 @@
 msgid ""
 "Adjustments will cause the current solution to be discarded and recalculated "
 "as necessary."
-msgstr "Muutokset hylkäävät nykyisen ratkaisun ja etsivät uuden, jos se on tarpeen."
+msgstr ""
+"Muutokset hylkäävät nykyisen ratkaisun ja etsivät uuden, jos se on tarpeen."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Seuraavat toiminnot selvittävät nämä riippuvuudet:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Hyväksytkö tämän ratkaisun? [Kyllä=y/ei=n/lopeta=q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Lopetetaan yritykset ratkaista näitä riippuvuuksia."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Käytettävissä olevat komennot:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Mihin tiedostoon selvityksen tila tallennetaan? "
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "En pysty kirjoittamaan tiedostoon %s"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Virhe kirjoitettaessa selvityksen tilatietoja tiedostoon %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Virheellinen syöte; anna jokin seuraavista komennoista:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
-msgstr "Ratkaisua ei löytynyt annetun ajan sisällä.  Yritetäänkö pitempään? [Kyllä=y/ei=n]"
+msgstr ""
+"Ratkaisua ei löytynyt annetun ajan sisällä.  Yritetäänkö pitempään? [Kyllä=y/"
+"ei=n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Virheellinen syöte; kirjoita joko 'y' (kyllä) tai 'n' (ei)."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Riippuvuuksien selvitys epäonnistui!  Luovutan..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Ei muita ratkaisuja"
 
-#: src/cmdline/cmdline_search.cc:76
+#: src/cmdline/cmdline_search.cc:72
+#, c-format
+msgid "iconv of %s failed.\n"
+msgstr ""
+
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: Ainakin yksi hakuehto tarvitaan\n"
@@ -971,201 +996,201 @@
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:\n"
 
-#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:120 src/cmdline/cmdline_show.cc:306
 #: src/solution_fragment.cc:65
 msgid "<NULL>"
 msgstr "<NULL>"
 
-#: src/cmdline/cmdline_show.cc:138
+#: src/cmdline/cmdline_show.cc:139
 msgid "not installed"
 msgstr "ei asennettu"
 
-#: src/cmdline/cmdline_show.cc:140 src/pkg_columnizer.cc:231
+#: src/cmdline/cmdline_show.cc:141 src/pkg_columnizer.cc:233
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "purettu"
 
-#: src/cmdline/cmdline_show.cc:142
+#: src/cmdline/cmdline_show.cc:143
 msgid "partially configured"
 msgstr "asetus kesken"
 
-#: src/cmdline/cmdline_show.cc:144
+#: src/cmdline/cmdline_show.cc:145
 msgid "partially installed"
 msgstr "osittain asennettu"
 
-#: src/cmdline/cmdline_show.cc:146
+#: src/cmdline/cmdline_show.cc:147
 msgid "not installed (configuration files remain)"
 msgstr "ei asennettu (asetustiedostot ovat olemassa)"
 
-#: src/cmdline/cmdline_show.cc:148 src/pkg_columnizer.cc:239
+#: src/cmdline/cmdline_show.cc:149 src/pkg_columnizer.cc:241
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "asennettu"
 
-#: src/cmdline/cmdline_show.cc:157
+#: src/cmdline/cmdline_show.cc:158
 msgid "not a real package"
 msgstr "ei oikea paketti"
 
-#: src/cmdline/cmdline_show.cc:170
+#: src/cmdline/cmdline_show.cc:171
 msgid " [held]"
 msgstr " [jäissä]"
 
-#: src/cmdline/cmdline_show.cc:179
+#: src/cmdline/cmdline_show.cc:180
 #, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; versio %s asennetaan"
 
-#: src/cmdline/cmdline_show.cc:183
+#: src/cmdline/cmdline_show.cc:184
 #, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; versio %s asennetaan automaattisesti"
 
-#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
+#: src/cmdline/cmdline_show.cc:190 src/cmdline/cmdline_show.cc:205
 #, c-format
 msgid "%s; will be purged"
 msgstr "%s; siivotaan"
 
-#: src/cmdline/cmdline_show.cc:202
+#: src/cmdline/cmdline_show.cc:203
 #, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; siivotaan, koska mikään ei riipu siitä"
 
-#: src/cmdline/cmdline_show.cc:209
+#: src/cmdline/cmdline_show.cc:210
 #, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; poistetaan, koska mikään ei riipu siitä"
 
-#: src/cmdline/cmdline_show.cc:211
+#: src/cmdline/cmdline_show.cc:212
 #, c-format
 msgid "%s; will be removed"
 msgstr "%s; poistetaan."
 
-#: src/cmdline/cmdline_show.cc:225
+#: src/cmdline/cmdline_show.cc:226
 #, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; vanhennetaan [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:228
+#: src/cmdline/cmdline_show.cc:229
 #, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; päivitetään [%s -> %s]"
 
-#: src/cmdline/cmdline_show.cc:240 src/cmdline/cmdline_show.cc:261
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:262
 msgid "Package: "
 msgstr "Paketti: "
 
-#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:269
-#: src/pkg_columnizer.cc:87
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:270
+#: src/pkg_columnizer.cc:89
 msgid "State"
 msgstr "Tila"
 
-#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:325
+#: src/cmdline/cmdline_show.cc:243 src/cmdline/cmdline_show.cc:326
 msgid "Provided by"
 msgstr "Kattavat"
 
-#: src/cmdline/cmdline_show.cc:263 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:264 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Välttämätön: "
 
-#: src/cmdline/cmdline_show.cc:263 src/cmdline/cmdline_show.cc:267
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:264 src/cmdline/cmdline_show.cc:268
+#: src/cmdline/cmdline_show.cc:279 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "on"
 
-#: src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:268
 msgid "New"
 msgstr "Uusi"
 
-#: src/cmdline/cmdline_show.cc:272
+#: src/cmdline/cmdline_show.cc:273
 msgid "Forbidden version"
 msgstr "Estetty versio"
 
-#: src/cmdline/cmdline_show.cc:276
+#: src/cmdline/cmdline_show.cc:277
 msgid "Automatically installed"
 msgstr "Automaattisesti asennettu"
 
-#: src/cmdline/cmdline_show.cc:278
+#: src/cmdline/cmdline_show.cc:279
 msgid "no"
 msgstr "ei"
 
-#: src/cmdline/cmdline_show.cc:280
+#: src/cmdline/cmdline_show.cc:281
 msgid "Version: "
 msgstr "Versio: "
 
-#: src/cmdline/cmdline_show.cc:281 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:282 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Tärkeys: "
 
-#: src/cmdline/cmdline_show.cc:282 src/cmdline/cmdline_show.cc:284
-#: src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:283 src/cmdline/cmdline_show.cc:285
+#: src/cmdline/cmdline_show.cc:294
 msgid "N/A"
 msgstr "???"
 
-#: src/cmdline/cmdline_show.cc:283 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:284 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Ryhmä: "
 
-#: src/cmdline/cmdline_show.cc:285 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:286 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Vastuuhenkilö: "
 
-#: src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:289
 msgid "Uncompressed Size: "
 msgstr "Koko purettuna: "
 
-#: src/cmdline/cmdline_show.cc:292
+#: src/cmdline/cmdline_show.cc:293
 msgid "Architecture: "
 msgstr "Arkkitehtuuri: "
 
-#: src/cmdline/cmdline_show.cc:294
+#: src/cmdline/cmdline_show.cc:295
 msgid "Compressed Size: "
 msgstr "Koko pakattuna: "
 
-#: src/cmdline/cmdline_show.cc:296
+#: src/cmdline/cmdline_show.cc:297
 msgid "Filename: "
 msgstr "Tiedosto: "
 
-#: src/cmdline/cmdline_show.cc:298
+#: src/cmdline/cmdline_show.cc:299
 msgid "MD5sum: "
 msgstr "MD5-summa: "
 
-#: src/cmdline/cmdline_show.cc:302 src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:303 src/cmdline/cmdline_show.cc:306
 msgid "Archive"
 msgstr "Arkisto"
 
-#: src/cmdline/cmdline_show.cc:310
+#: src/cmdline/cmdline_show.cc:311
 msgid "Depends"
 msgstr "Riippuvuudet"
 
-#: src/cmdline/cmdline_show.cc:312
+#: src/cmdline/cmdline_show.cc:313
 msgid "PreDepends"
 msgstr "Esiriippuvuudet"
 
-#: src/cmdline/cmdline_show.cc:314
+#: src/cmdline/cmdline_show.cc:315
 msgid "Recommends"
 msgstr "Suosittelut"
 
-#: src/cmdline/cmdline_show.cc:316
+#: src/cmdline/cmdline_show.cc:317
 msgid "Suggests"
 msgstr "Ehdotukset"
 
-#: src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:319
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: src/cmdline/cmdline_show.cc:320
+#: src/cmdline/cmdline_show.cc:321
 msgid "Replaces"
 msgstr "Korvaavuudet"
 
-#: src/cmdline/cmdline_show.cc:322
+#: src/cmdline/cmdline_show.cc:323
 msgid "Obsoletes"
 msgstr "Täydet korvaavuudet"
 
-#: src/cmdline/cmdline_show.cc:324
+#: src/cmdline/cmdline_show.cc:325
 msgid "Provides"
 msgstr "Katetut"
 
-#: src/cmdline/cmdline_show.cc:328 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:329 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Kuvaus: "
 
@@ -1216,24 +1241,24 @@
 msgid "UNAVAILABLE"
 msgstr "EI SAATAVILLA"
 
-#: src/download_bar.cc:56 src/download_list.cc:266 src/download_screen.cc:57
+#: src/download_bar.cc:57 src/download_list.cc:279 src/download_screen.cc:67
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "Aseta levyke nimeltä \"%s\" asemaan \"%s\""
 
-#: src/download_bar.cc:75 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Löytyi "
 
-#: src/download_bar.cc:88
+#: src/download_bar.cc:89
 msgid "Downloading "
 msgstr "Nouto: "
 
-#: src/download_bar.cc:101
+#: src/download_bar.cc:102
 msgid "Got "
 msgstr "Noudettu: "
 
-#: src/download_bar.cc:155
+#: src/download_bar.cc:156
 msgid "Downloading..."
 msgstr "Noudan..."
 
@@ -1261,7 +1286,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "En pystynyt siivoamaan luettelohakemistoja"
 
-#: src/download.cc:177 src/ui.cc:1147
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Poistan vanhentuneita tiedostoja"
 
@@ -1385,7 +1410,8 @@
 
 #: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
-msgstr "Sisäinen virhe: en pystynyt muodostamaan luetteloa noudettavista paketeista"
+msgstr ""
+"Sisäinen virhe: en pystynyt muodostamaan luetteloa noudettavista paketeista"
 
 #: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
@@ -1396,7 +1422,7 @@
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr "Oih!  Jotain ikävää tapahtui asennuksessa.  Yritän toipua:"
 
-#: src/download.cc:477 src/pkg_item.cc:430
+#: src/download.cc:477 src/pkg_item.cc:431
 msgid "Press return to continue.\n"
 msgstr "Paina return jatkaaksesi.\n"
 
@@ -1406,71 +1432,76 @@
 msgstr ""
 "En saanut järjestelmälukitusta!  (Ehkä apt tai dpkg on ajossa muualta?)"
 
-#: src/download_item.cc:70 src/download_item.cc:74 src/download_item.cc:104
+#: src/download_item.cc:72 src/download_item.cc:76 src/download_item.cc:98
 #: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Toimin]"
 
-#: src/download_item.cc:108 src/download_list.cc:284
+#: src/download_item.cc:102 src/download_list.cc:305
 msgid "[Hit]"
 msgstr "[Ohi]"
 
-#: src/download_item.cc:108 src/download_list.cc:304
+#: src/download_item.cc:102 src/download_list.cc:325
 msgid "[Downloaded]"
 msgstr "[Noudettu]"
 
-#: src/download_list.cc:51
+#: src/download_list.cc:62
 #, c-format
 msgid "Downloaded %sB in %s (%sB/s)."
 msgstr "Noudin %sB ajassa %s (%sB/s)."
 
-#: src/download_list.cc:57
+#: src/download_list.cc:68
 #, c-format
 msgid "%n%nSome files were not downloaded successfully."
 msgstr "%n%nJoidenkin tiedostojen nouto epäonnistui."
 
-#: src/download_list.cc:66
+#: src/download_list.cc:78 src/download_list.cc:286 src/download_screen.cc:75
 msgid "Continue"
 msgstr "Jatka"
 
-#: src/download_list.cc:178 src/download_screen.cc:203
+#: src/download_list.cc:187 src/download_screen.cc:222
 msgid "Total Progress: "
 msgstr "Edistyminen: "
 
-#: src/download_list.cc:197 src/download_screen.cc:218
+#: src/download_list.cc:206 src/download_screen.cc:237
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s jäljellä)"
 
-#: src/download_list.cc:199
+#: src/download_list.cc:208
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (seisoksissa)"
 
-#: src/download_list.cc:201
+#: src/download_list.cc:210
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:324
+#: src/download_list.cc:289 src/download_screen.cc:78
+#, fuzzy
+msgid "Abort"
+msgstr "Keskeytys.\n"
+
+#: src/download_list.cc:345
 msgid "[IGNORED]"
 msgstr "[SIVUUTETTU]"
 
-#: src/download_list.cc:330
+#: src/download_list.cc:351
 msgid "[ERROR]"
 msgstr "[VIRHE]"
 
-#: src/download_screen.cc:181
+#: src/download_screen.cc:199
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Noudin %sB ajassa %ss (%sB/s)."
 
-#: src/edit_pkg_hier.cc:176
+#: src/edit_pkg_hier.cc:179
 msgid "No hierarchy information to edit"
 msgstr "Muokattavaa hierarkiatietoa ei ole"
 
-#: src/edit_pkg_hier.cc:276
+#: src/edit_pkg_hier.cc:279
 msgid "Couldn't open for writing"
 msgstr "En pysty kirjoittamaan tiedostoon"
 
@@ -1552,7 +1583,8 @@
 
 #: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
-msgstr "Haluat ehkä päivittää pakettiluettelon korjataksesi nämä puuttuvat tiedostot"
+msgstr ""
+"Haluat ehkä päivittää pakettiluettelon korjataksesi nämä puuttuvat tiedostot"
 
 #: src/generic/apt.cc:152
 #, c-format
@@ -1560,9 +1592,10 @@
 msgstr "En pysty korvaamaan %s:a uudella asetustiedostolla"
 
 #: src/generic/apt.cc:227
-msgid "Warning: could not lock the cache file.  Opening in read-only mode"
+msgid ""
+"Could not lock the cache file.  Opening in read-only mode; any changes you "
+"make to the states of packages will NOT be preserved!"
 msgstr ""
-"Varoitus: varaston lukitus epäonnistui, joten siihen ei nyt voi kirjoittaa"
 
 #: src/generic/matchers.cc:798
 msgid "Unmatched '('"
@@ -1616,11 +1649,11 @@
 msgstr ""
 "Pakettihakemisto on hajalla.  Paketilta %s puuttuu Tiedostonimi-kenttä."
 
-#: src/generic/pkg_changelog.cc:105
+#: src/generic/pkg_changelog.cc:107
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "Arvoa $HOME ei löytynyt, käytän TMPDIR:iä (turvaton)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:76
+#: src/generic/pkg_changelog.cc:149 src/view_changelog.cc:79
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "%s:n muutosloki"
@@ -1661,37 +1694,37 @@
 msgid "Reading task descriptions"
 msgstr "Luen tehtäväkuvauksia"
 
-#: src/load_config.cc:42
+#: src/load_config.cc:44
 #, c-format
 msgid "Unrecognized color name \"%s\""
 msgstr "Tunnistamaton värin nimi \"%s\""
 
-#: src/load_config.cc:69
+#: src/load_config.cc:71
 #, c-format
 msgid "Unrecognized attribute name \"%s\""
 msgstr "Tunnistamaton ominaisuus \"%s\""
 
-#: src/load_config.cc:106
+#: src/load_config.cc:109
 #, c-format
 msgid "Invalid entry in style definition group: \"%s\""
 msgstr "Virheellinen alkio \"%s\" tyylimäärittelyryhmässä"
 
-#: src/load_config.cc:108
+#: src/load_config.cc:111
 #, c-format
 msgid "Invalid tagless entry in style definition group: \"%s\""
 msgstr "Virheellinen merkitsemätön alkio \"%s\" tyylimäärittelyryhmässä"
 
-#: src/load_config.cc:130
+#: src/load_config.cc:133
 #, c-format
 msgid "Unknown style attribute %s"
 msgstr "Tunnistamaton tyyliominaisuus %s"
 
-#: src/load_config.cc:153 src/load_config.cc:155
+#: src/load_config.cc:156 src/load_config.cc:158
 #, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Virheellinen alkio \"%s\" näppäinsidontaryhmässä"
 
-#: src/load_config.cc:170
+#: src/load_config.cc:173
 #, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Sivuutan virheellisen näppäinsidonnan \"%s\" -> \"%s\""
@@ -1770,28 +1803,33 @@
 msgid "Invalid grouping policy type '%s'"
 msgstr "Virheellinen lajittelutyylin tyyppi '%s'"
 
-#: src/load_pkgview.cc:57
+#: src/load_pkgview.cc:58
 msgid "Couldn't parse layout: No column format specified for static item"
 msgstr "En ymmärtänyt asettelua: Staattisella alkiolla ei ole sarakemuotoilua"
 
-#: src/load_pkgview.cc:104
+#: src/load_pkgview.cc:91
+#, fuzzy
+msgid "Couldn't parse layout: encoding error in column descriptor"
+msgstr "En ymmärtänyt asettelua: rivinumeroa ei ole annettu"
+
+#: src/load_pkgview.cc:112
 #, c-format
 msgid "Couldn't parse layout: unknown view item type \"%s\""
 msgstr "En ymmärtänyt asettelua: \"%s\" on tuntematon tyyppi näkymäalkiolle"
 
-#: src/load_pkgview.cc:111 src/load_pkgview.cc:119
+#: src/load_pkgview.cc:119 src/load_pkgview.cc:127
 msgid "Couldn't parse layout: no row number specified"
 msgstr "En ymmärtänyt asettelua: rivinumeroa ei ole annettu"
 
-#: src/load_pkgview.cc:127
+#: src/load_pkgview.cc:135
 msgid "Couldn't parse layout: no width specified"
 msgstr "En ymmärtänyt asettelua: leveyttä ei ole annettu"
 
-#: src/load_pkgview.cc:135
+#: src/load_pkgview.cc:143
 msgid "Couldn't parse layout: no height specified"
 msgstr "En ymmärtänyt asettelua: korkeutta ei ole annettu"
 
-#: src/load_pkgview.cc:166 src/load_pkgview.cc:184
+#: src/load_pkgview.cc:174 src/load_pkgview.cc:192
 #, c-format
 msgid "Unknown alignment type '%s'"
 msgstr "Tuntematon sijoitusasema '%s'"
@@ -1821,17 +1859,27 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Lajittelutyylillä virheellinen tyyppi '%s'"
 
-#: src/main.cc:69
+#: src/main.cc:79
+#, c-format
+msgid "Can't decode multibyte string after \"%ls\""
+msgstr ""
+
+#: src/main.cc:88
+#, c-format
+msgid "Can't decode wide-character string after \"%s\""
+msgstr ""
+
+#: src/main.cc:96
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s käännöspäiväys %s %s\n"
 
-#: src/main.cc:72
+#: src/main.cc:99
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kääntäjä: g++ %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:102
 #, c-format
 msgid ""
 "\n"
@@ -1840,7 +1888,7 @@
 "\n"
 "NCurses-versio: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:104
 #, c-format
 msgid ""
 "\n"
@@ -1849,22 +1897,22 @@
 "\n"
 "Curses-versio: %s\n"
 
-#: src/main.cc:79
+#: src/main.cc:106
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++-versio: %s\n"
 
-#: src/main.cc:85
+#: src/main.cc:112
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Käyttö: aptitude [-S tnimi] [-u|-i]"
 
-#: src/main.cc:87
+#: src/main.cc:114
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [valitsimet] <toiminto> ..."
 
-#: src/main.cc:89
+#: src/main.cc:116
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1874,42 +1922,42 @@
 "tilaan):\n"
 "\n"
 
-#: src/main.cc:90
+#: src/main.cc:117
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Asenna tai päivitä paketteja\n"
 
-#: src/main.cc:91
+#: src/main.cc:118
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Poista paketteja\n"
 
-#: src/main.cc:92
+#: src/main.cc:119
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Poista paketteja asetustiedostoineen\n"
 
-#: src/main.cc:93
+#: src/main.cc:120
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Jäädytä paketteja\n"
 
-#: src/main.cc:94
+#: src/main.cc:121
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Peruuta paketin jäädytys\n"
 
-#: src/main.cc:95
+#: src/main.cc:122
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - Merkitse paketteja automaattisesti asennetuiksi\n"
 
-#: src/main.cc:96
+#: src/main.cc:123
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Merkitse paketteja käsin asennetuiksi\n"
 
-#: src/main.cc:101
+#: src/main.cc:128
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1918,153 +1966,153 @@
 " forbid-version - Estä aptitudea päivittämästä pakettia määritettyyn "
 "versioon\n"
 
-#: src/main.cc:102
+#: src/main.cc:129
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Nouda uusien ja päivitettävien pakettien luettelo\n"
 
-#: src/main.cc:103
+#: src/main.cc:130
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade       - Päivitä turvallisesti\n"
 
-#: src/main.cc:104
+#: src/main.cc:131
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr " dist-upgrade  - Päivitä sallien pakettien asennukset ja poistot\n"
 
-#: src/main.cc:105
+#: src/main.cc:132
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Tyhjennä uusien pakettien ryhmä\n"
 
-#: src/main.cc:106
+#: src/main.cc:133
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Etsi paketteja nimellä tai lausekkeella\n"
 
-#: src/main.cc:107
+#: src/main.cc:134
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Näytä paketin yksityiskohtaiset tiedot\n"
 
-#: src/main.cc:108
+#: src/main.cc:135
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Poista noudetut pakettitiedostot\n"
 
-#: src/main.cc:109
+#: src/main.cc:136
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Poista vanhat noudetut pakettitiedostot\n"
 
-#: src/main.cc:110
+#: src/main.cc:137
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " muutosloki   - Näytä paketin muutosloki\n"
 
-#: src/main.cc:111
+#: src/main.cc:138
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Nouda pakettitiedosto\n"
 
-#: src/main.cc:113
+#: src/main.cc:140
 #, c-format
 msgid "  Options:\n"
 msgstr "  Valitsimet:\n"
 
-#: src/main.cc:114
+#: src/main.cc:141
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Tämä avustusteksti\n"
 
-#: src/main.cc:115
+#: src/main.cc:142
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Tulosta suoritettavat toiminnot, mutta älä suorita niitä.\n"
 
-#: src/main.cc:116
+#: src/main.cc:143
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Älä asenna tai poista paketteja, ainoastaan nouda ne.\n"
 
-#: src/main.cc:117
+#: src/main.cc:144
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Kysy aina varmistusta tai toimintoa\n"
 
-#: src/main.cc:118
+#: src/main.cc:145
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             Vastaa yksinkertaisiin kyllä/ei-kysymyksiin kyllä.\n"
 
-#: src/main.cc:119
+#: src/main.cc:146
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr " -F muotoilu    Määritä hakutulosten näyttömuoto; katso käyttöopasta\n"
 
-#: src/main.cc:120
+#: src/main.cc:147
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr " -O järjestys   Määritä hakutulosten järjestys; katso käyttöopasta\n"
 
-#: src/main.cc:121
+#: src/main.cc:148
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w leveys      Määritä näytön leveys hakutuloksia varten\n"
 
-#: src/main.cc:122
+#: src/main.cc:149
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Yritä tosissaan korjata rikkinäisten pakettien "
 "riippuvuuksia.\n"
 
-#: src/main.cc:123
+#: src/main.cc:150
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Näytä asennettavien pakettien versiot.\n"
 
-#: src/main.cc:124
+#: src/main.cc:151
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Näytä automaattisesti muutettujen pakettien riippuvuudet.\n"
 
-#: src/main.cc:125
+#: src/main.cc:152
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Näytä asennetun koon muutos jokaisesta paketista.\n"
 
-#: src/main.cc:126
+#: src/main.cc:153
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v             Näytä lisätietoa (voidaan käyttää useita kertoja)\n"
 
-#: src/main.cc:127
+#: src/main.cc:154
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [julkaisu]   Aseta julkaisu, josta paketit asennetaan\n"
 
-#: src/main.cc:128
+#: src/main.cc:155
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o avain=arvo  Anna suoraan asetuksen 'avain' arvo\n"
 
-#: src/main.cc:129
+#: src/main.cc:156
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2073,479 +2121,496 @@
 " --with(out)-recommends\tMääritä, käsitelläänkö suosituksia\n"
 "                riippuvuuksina\n"
 
-#: src/main.cc:130
+#: src/main.cc:157
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S tnimi: Lue aptituden laajennetut tilatiedot tiedostosta tnimi.\n"
 
-#: src/main.cc:131
+#: src/main.cc:158
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Aloita pakettiluettelon päivitys käynnistettäessä.\n"
 
-#: src/main.cc:132
+#: src/main.cc:159
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Näytä toimenpideruutu käynnistettäessä.\n"
 
-#: src/main.cc:134
+#: src/main.cc:161
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                      Tällä aptitudella ei ole Lehmävoimia.\n"
 
-#: src/main.cc:252
+#: src/main.cc:284
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o:n argumentin on oltava muotoa avain=arvo; se oli %s"
 
-#: src/main.cc:291 src/main.cc:300
+#: src/main.cc:323 src/main.cc:332
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "OUTOA: tuntematon valitsin\n"
 
-#: src/main.cc:309
+#: src/main.cc:341
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Valitsimia -u ja -i ei voi käyttää yhdessä\n"
 
-#: src/main.cc:317
+#: src/main.cc:349
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "Valitsimia -u ja -i ei voi käyttää komentorivitoiminnoissa"
 
-#: src/main.cc:338
+#: src/main.cc:370
 msgid "-u and -i may not be specified with a command"
 msgstr "Valitsimia -u ja -i ei voi käyttää komennon kanssa"
 
-#: src/main.cc:395
+#: src/main.cc:427
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Tuntematon komento \"%s\"\n"
 
-#: src/main.cc:402 src/main.cc:450
+#: src/main.cc:434 src/main.cc:482
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr "Ohjelmavirhe: ratkaisut loppuivat odottamatta.\n"
 
-#: src/main.cc:407 src/main.cc:455
+#: src/main.cc:439 src/main.cc:487
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr "Ohjelmavirhe: aika loppui odottamatta.\n"
 
-#: src/main.cc:414
+#: src/main.cc:446
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Varoitus: kokoruutuliittymä ei huomioi asetusta -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:93
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
+msgid "Minesweeper"
+msgstr "Miinaharava"
+
+#: src/mine/cmine.cc:94
 #, c-format
 msgid "%i/%i mines  %d %s"
 msgstr "%i/%i miinaa  %d %s"
 
-#: src/mine/cmine.cc:97 src/mine/cmine.cc:104
+#: src/mine/cmine.cc:98 src/mine/cmine.cc:105
 msgid "second"
 msgstr "sekunti"
 
-#: src/mine/cmine.cc:97 src/mine/cmine.cc:104
+#: src/mine/cmine.cc:98 src/mine/cmine.cc:105
 msgid "seconds"
 msgstr "sekuntia"
 
-#: src/mine/cmine.cc:101
-#, c-format
-msgid "Minesweeper    %s in %d %s"
+#: src/mine/cmine.cc:102
+#, fuzzy, c-format
+msgid "    %s in %d %s"
 msgstr "Miinaharava    %s ajassa %d %s"
 
-#: src/mine/cmine.cc:102
+#: src/mine/cmine.cc:103
 msgid "Won"
 msgstr "Voitto"
 
-#: src/mine/cmine.cc:102
+#: src/mine/cmine.cc:103
 msgid "Lost"
 msgstr "Häviö"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1084
-msgid "Minesweeper"
-msgstr "Miinaharava"
-
-#: src/mine/cmine.cc:131 src/mine/cmine.cc:168
+#: src/mine/cmine.cc:145 src/mine/cmine.cc:187
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Tiedoston \"%s\" avaus epäonnistui"
 
-#: src/mine/cmine.cc:145
+#: src/mine/cmine.cc:160
 #, c-format
 msgid "Could not load game from %s"
 msgstr "Peliä ei voinut ladata %s:sta"
 
-#: src/mine/cmine.cc:195
-msgid "The board height must be a number"
+#: src/mine/cmine.cc:218
+#, fuzzy
+msgid "The board height must be a positive integer"
 msgstr "Laudan koon on oltava luku"
 
-#: src/mine/cmine.cc:207
-msgid "The board width must be a number"
+#: src/mine/cmine.cc:230
+#, fuzzy
+msgid "The board width must be a positive integer"
 msgstr "Laudan leveyden on oltava luku"
 
-#: src/mine/cmine.cc:220
-msgid "The number of mines must be a number"
-msgstr "Miinojen lukumäärän on oltava luku"
+#: src/mine/cmine.cc:242
+#, fuzzy
+msgid "Invalid mine count; please enter a positive integer"
+msgstr "Virheellinen syöte; kirjoita joko 'y' (kyllä) tai 'n' (ei)."
 
-#: src/mine/cmine.cc:238
+#: src/mine/cmine.cc:260
 msgid "Setup custom game"
 msgstr "Valmistele oma peli"
 
-#: src/mine/cmine.cc:240
+#: src/mine/cmine.cc:262
 msgid "Height of board: "
 msgstr "Laudan korkeus: "
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:265
 msgid "Width of board: "
 msgstr "Laudan leveys: "
 
-#: src/mine/cmine.cc:246
+#: src/mine/cmine.cc:268
 msgid "Number of mines: "
 msgstr "Miinojen lukumäärä: "
 
-#: src/mine/cmine.cc:305
+#: src/mine/cmine.cc:327
 msgid "Choose difficulty level"
 msgstr "Valitse vaikeustaso"
 
-#: src/mine/cmine.cc:307
+#: src/mine/cmine.cc:329
 msgid "Easy"
 msgstr "Helppo"
 
-#: src/mine/cmine.cc:308
+#: src/mine/cmine.cc:330
 msgid "Medium"
 msgstr "Keskitaso"
 
-#: src/mine/cmine.cc:309
+#: src/mine/cmine.cc:331
 msgid "Hard"
 msgstr "Vaikea"
 
-#: src/mine/cmine.cc:310
+#: src/mine/cmine.cc:332
 msgid "Custom"
 msgstr "Oma"
 
-#: src/mine/cmine.cc:392
+#: src/mine/cmine.cc:418
 msgid "You have won."
 msgstr "Voitit."
 
-#: src/mine/cmine.cc:395
+#: src/mine/cmine.cc:421
 msgid "You lose!"
 msgstr "Hävisit!"
 
-#: src/mine/cmine.cc:400
+#: src/mine/cmine.cc:426
 msgid "You die...  --More--"
 msgstr "Kuoolee...  --Lisää--"
 
-#: src/mine/cmine.cc:413
+#: src/mine/cmine.cc:439
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Piikeissä oli myrkkyä!  Myrkky tappaa..  --Lisää--"
 
-#: src/mine/cmine.cc:416
+#: src/mine/cmine.cc:442
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Putoat teräviin rautapiikkeihin!  --Lisää--"
 
-#: src/mine/cmine.cc:419
+#: src/mine/cmine.cc:445
 msgid "You fall into a pit!  --More--"
 msgstr "Putoat kuoppaan!  --Lisää--"
 
-#: src/mine/cmine.cc:422
+#: src/mine/cmine.cc:448
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "JUTUM!  Astut maamiinaan.  --Lisää--"
 
-#: src/mine/cmine.cc:427
+#: src/mine/cmine.cc:453
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Tikassa oli myrkkyä!  Myrkky tappaa...  --Lisää--"
 
-#: src/mine/cmine.cc:429
+#: src/mine/cmine.cc:455
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Pieni tikka laukeaa!  Pieni tikka osuu sinuun!  --Lisää--"
 
-#: src/mine/cmine.cc:433
+#: src/mine/cmine.cc:459
 msgid "You turn to stone... --More--"
 msgstr "Kivetyt... --Lisää--"
 
-#: src/mine/cmine.cc:435
+#: src/mine/cmine.cc:461
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Ei olisi pitänyt koskea kukkoliskon raatoon.  --Lisää--"
 
-#: src/mine/cmine.cc:437
+#: src/mine/cmine.cc:463
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Tunnet kukkoliskon raadon.  --Lisää--"
 
-#: src/mine/cmine.cc:441
+#: src/mine/cmine.cc:467
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "Klik!  Laukaiset murkula-ansan!  Murkula osuu sinuun! --Lisää--"
 
-#: src/mine/cmine.cc:451
+#: src/mine/cmine.cc:477
 msgid "sleep"
 msgstr "nukutus"
 
-#: src/mine/cmine.cc:454
+#: src/mine/cmine.cc:480
 msgid "striking"
 msgstr "isku"
 
-#: src/mine/cmine.cc:457
+#: src/mine/cmine.cc:483
 msgid "death"
 msgstr "kuoleman"
 
-#: src/mine/cmine.cc:460
+#: src/mine/cmine.cc:486
 msgid "polymorph"
 msgstr "muodonmuutos"
 
-#: src/mine/cmine.cc:463
+#: src/mine/cmine.cc:489
 msgid "magic missile"
 msgstr "taikanuoli"
 
-#: src/mine/cmine.cc:466
+#: src/mine/cmine.cc:492
 msgid "secret door detection"
 msgstr "salaoventunnistus"
 
-#: src/mine/cmine.cc:469
+#: src/mine/cmine.cc:495
 msgid "invisibility"
 msgstr "näkymättömyys"
 
-#: src/mine/cmine.cc:472
+#: src/mine/cmine.cc:498
 msgid "cold"
 msgstr "kylmyys"
 
-#: src/mine/cmine.cc:478
+#: src/mine/cmine.cc:504
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Sinun %ssauvasi hajoaa ja jysähtää!  --Lisää--"
 
-#: src/mine/cmine.cc:484
+#: src/mine/cmine.cc:510
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Sähköshokkihoitoa pesee!  --Lisää--"
 
-#: src/mine/cmine.cc:588
+#: src/mine/cmine.cc:612
 msgid "Enter the filename to load: "
 msgstr "Syötä ladattavan tiedoston nimi: "
 
-#: src/mine/cmine.cc:595
+#: src/mine/cmine.cc:619
 msgid "Enter the filename to save: "
 msgstr "Syötä tallennustiedoston nimi: "
 
-#: src/mine/cmine.cc:605
+#: src/mine/cmine.cc:629
 msgid "mine-help.txt"
 msgstr "mine-help-fi.txt"
 
+#: src/mine/cmine.cc:631
+msgid "Encoding of mine-help.txt|UTF-8"
+msgstr ""
+
 # Left as is on purpose, at least for now - JJK
-#: src/pkg_columnizer.cc:81
+#: src/pkg_columnizer.cc:83
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:84 src/ui.cc:1662
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paketti"
 
-#: src/pkg_columnizer.cc:85
+#: src/pkg_columnizer.cc:87
 msgid "InstSz"
 msgstr "Asennuskoko"
 
-#: src/pkg_columnizer.cc:86
+#: src/pkg_columnizer.cc:88
 msgid "DebSz"
 msgstr "Deb:n koko"
 
-#: src/pkg_columnizer.cc:88
+#: src/pkg_columnizer.cc:90
 msgid "Action"
 msgstr "Toimenpide"
 
-#: src/pkg_columnizer.cc:89
+#: src/pkg_columnizer.cc:91
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/pkg_columnizer.cc:90
+#: src/pkg_columnizer.cc:92
 msgid "InstVer"
 msgstr "As.ver"
 
-#: src/pkg_columnizer.cc:91
+#: src/pkg_columnizer.cc:93
 msgid "CandVer"
 msgstr "Ehd.ver"
 
 # I'm not fully happy with this or the next one but they are passable.
 # JJK
-#: src/pkg_columnizer.cc:92
+#: src/pkg_columnizer.cc:94
 msgid "LongState"
 msgstr "Tila kokonaan"
 
-#: src/pkg_columnizer.cc:93
+#: src/pkg_columnizer.cc:95
 msgid "LongAction"
 msgstr "Toimenpide kokonaan"
 
-#: src/pkg_columnizer.cc:94
+#: src/pkg_columnizer.cc:96
 msgid "Maintainer"
 msgstr "Vastuuhenkilö"
 
-#: src/pkg_columnizer.cc:95
+#: src/pkg_columnizer.cc:97
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: src/pkg_columnizer.cc:96
+#: src/pkg_columnizer.cc:98
 msgid "Section"
 msgstr "Ryhmä"
 
 # Apparently this stands for Reverse Count and not Release Critical.  I have no
 # idea how to translate it.
 # JJK
-#: src/pkg_columnizer.cc:97
+#: src/pkg_columnizer.cc:99
 msgid "RC"
 msgstr "RC"
 
-#: src/pkg_columnizer.cc:98
+#: src/pkg_columnizer.cc:100
 msgid "Auto"
 msgstr "Auto"
 
-#: src/pkg_columnizer.cc:99
+#: src/pkg_columnizer.cc:101
 msgid "Tag"
 msgstr "Merkki"
 
-#: src/pkg_columnizer.cc:102
+#: src/pkg_columnizer.cc:104
 msgid "ProgName"
 msgstr "OhjNimi"
 
-#: src/pkg_columnizer.cc:103
+#: src/pkg_columnizer.cc:105
 msgid "ProgVer"
 msgstr "OhjVer"
 
-#: src/pkg_columnizer.cc:104
+#: src/pkg_columnizer.cc:106
 msgid "#Broken"
 msgstr "#Rikki"
 
-#: src/pkg_columnizer.cc:105
+#: src/pkg_columnizer.cc:107
 msgid "DiskUsage"
 msgstr "Levyn käyttö"
 
-#: src/pkg_columnizer.cc:106
+#: src/pkg_columnizer.cc:108
 msgid "DownloadSize"
 msgstr "Haun koko"
 
-#: src/pkg_columnizer.cc:126 src/pkg_columnizer.cc:138 src/pkg_ver_item.cc:103
+#: src/pkg_columnizer.cc:128 src/pkg_columnizer.cc:140 src/pkg_ver_item.cc:103
 #: src/pkg_ver_item.cc:168
 msgid "<N/A>"
 msgstr "<???>"
 
-#: src/pkg_columnizer.cc:168 src/pkg_columnizer.cc:179
+#: src/pkg_columnizer.cc:170 src/pkg_columnizer.cc:181
 msgid "<none>"
 msgstr "<ei ole>"
 
-#: src/pkg_columnizer.cc:219 src/pkg_grouppolicy.cc:222
+#: src/pkg_columnizer.cc:221 src/pkg_grouppolicy.cc:224
 msgid "virtual"
 msgstr "näennäinen"
 
-#: src/pkg_columnizer.cc:226 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
+#: src/pkg_columnizer.cc:228 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
 msgid "purged"
 msgstr "siivottu"
 
-#: src/pkg_columnizer.cc:233 src/pkg_ver_item.cc:227
+#: src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:227
 msgid "half-config"
 msgstr "asetus kesken"
 
-#: src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:229
+#: src/pkg_columnizer.cc:237 src/pkg_ver_item.cc:229
 msgid "half-install"
 msgstr "asennus kesken"
 
-#: src/pkg_columnizer.cc:237 src/pkg_ver_item.cc:231
+#: src/pkg_columnizer.cc:239 src/pkg_ver_item.cc:231
 msgid "config-files"
 msgstr "asetustiedostot"
 
-#: src/pkg_columnizer.cc:241 src/pkg_columnizer.cc:525 src/pkg_ver_item.cc:235
+#: src/pkg_columnizer.cc:243 src/pkg_columnizer.cc:527 src/pkg_ver_item.cc:235
 msgid "ERROR"
 msgstr "VIRHE"
 
-#: src/pkg_columnizer.cc:288 src/pkg_ver_item.cc:293
+#: src/pkg_columnizer.cc:290 src/pkg_ver_item.cc:293
 msgid "hold"
 msgstr "jäissä"
 
 #: src/pkg_columnizer.cc:293
+#, fuzzy
+msgid "forbidden upgrade"
+msgstr "%d päivitystä"
+
+#: src/pkg_columnizer.cc:295
 msgid "purge"
 msgstr "siivottu"
 
-#: src/pkg_columnizer.cc:293 src/pkg_ver_item.cc:317
+#: src/pkg_columnizer.cc:295 src/pkg_ver_item.cc:317
 msgid "delete"
 msgstr "poistettu"
 
-#: src/pkg_columnizer.cc:295 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
+#: src/pkg_columnizer.cc:297 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
 msgid "broken"
 msgstr "rikki"
 
-#: src/pkg_columnizer.cc:297 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
+#: src/pkg_columnizer.cc:299 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
 #: src/pkg_ver_item.cc:319
 msgid "install"
 msgstr "asenna"
 
-#: src/pkg_columnizer.cc:299
+#: src/pkg_columnizer.cc:301
 msgid "reinstall"
 msgstr "asenna uudelleen"
 
-#: src/pkg_columnizer.cc:301
+#: src/pkg_columnizer.cc:303
 msgid "upgrade"
 msgstr "päivitä"
 
-#: src/pkg_columnizer.cc:303 src/pkg_columnizer.cc:305 src/pkg_ver_item.cc:305
+#: src/pkg_columnizer.cc:305 src/pkg_columnizer.cc:307 src/pkg_ver_item.cc:305
 #: src/pkg_ver_item.cc:312 src/pkg_ver_item.cc:321 src/pkg_ver_item.cc:324
 msgid "none"
 msgstr "ei mitään"
 
-#: src/pkg_columnizer.cc:333 src/pkg_columnizer.cc:354
-#: src/pkg_columnizer.cc:361 src/pkg_grouppolicy.cc:216
+#: src/pkg_columnizer.cc:335 src/pkg_columnizer.cc:356
+#: src/pkg_columnizer.cc:363 src/pkg_grouppolicy.cc:218
 #: src/pkg_info_screen.cc:113 src/pkg_info_screen.cc:114
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:374
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/pkg_columnizer.cc:341 src/pkg_ver_item.cc:353
+#: src/pkg_columnizer.cc:343 src/pkg_ver_item.cc:353
 msgid "Imp"
 msgstr "Tär"
 
-#: src/pkg_columnizer.cc:343 src/pkg_ver_item.cc:355
+#: src/pkg_columnizer.cc:345 src/pkg_ver_item.cc:355
 msgid "Req"
 msgstr "Pak"
 
-#: src/pkg_columnizer.cc:345 src/pkg_ver_item.cc:357
+#: src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:357
 msgid "Std"
 msgstr "Vak"
 
-#: src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:359
+#: src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:359
 msgid "Opt"
 msgstr "Val"
 
-#: src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:361
+#: src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:361
 msgid "Xtr"
 msgstr "Lis"
 
-#: src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:363
+#: src/pkg_columnizer.cc:353 src/pkg_ver_item.cc:363
 msgid "ERR"
 msgstr "VRH"
 
-#: src/pkg_columnizer.cc:373
+#: src/pkg_columnizer.cc:375
 #, c-format
 msgid "#Broken: %ld"
 msgstr "#Rikki: %ld"
 
-#: src/pkg_columnizer.cc:388
+#: src/pkg_columnizer.cc:390
 #, c-format
 msgid "Will use %sB of disk space"
 msgstr "Vaatii %sB levytilaa"
 
-#: src/pkg_columnizer.cc:396
+#: src/pkg_columnizer.cc:398
 #, c-format
 msgid "Will free %sB of disk space"
 msgstr "Vapauttaa %sB levytilaa"
 
-#: src/pkg_columnizer.cc:410
+#: src/pkg_columnizer.cc:412
 #, c-format
 msgid "DL Size: %sB"
 msgstr "Haun koko: %sB"
 
-#: src/pkg_columnizer.cc:480
+#: src/pkg_columnizer.cc:482
 msgid "HN too long"
 msgstr "Nimi liian pitkä"
 
-#: src/pkg_columnizer.cc:654
+#: src/pkg_columnizer.cc:651 src/pkg_columnizer.cc:660
+#, c-format
+msgid "Unable to transcode package display format after \"%ls\""
+msgstr ""
+
+#: src/pkg_columnizer.cc:667
 msgid "Internal error: Default column string is unparsable"
 msgstr "Sisäinen virhe: Sarakejonoa ei voi jäsentää"
 
-#: src/pkg_grouppolicy.cc:150
+#: src/pkg_grouppolicy.cc:152
 msgid ""
 "Packages which set up your computer to perform a particular task\n"
 " Packages in the 'Tasks' section contain no files; they merely depend upon "
@@ -2557,7 +2622,7 @@
 "riippuvat toisista paketeista.  Tämä helpottaa valitsemaan joukon ennalta "
 "määriteltyjä paketteja, jotka liittyvät tiettyyn käyttötarkoitukseen."
 
-#: src/pkg_grouppolicy.cc:152
+#: src/pkg_grouppolicy.cc:154
 msgid ""
 "Packages with no declared section\n"
 " No section is given for these packages. Perhaps there is an error in the "
@@ -2567,7 +2632,7 @@
 " Näille paketeille ei ole määritelty ryhmää.  Packages-tiedosto voi olla "
 "virheellinen."
 
-#: src/pkg_grouppolicy.cc:154
+#: src/pkg_grouppolicy.cc:156
 msgid ""
 "Administrative utilities (install software, manage users, etc)\n"
 " Packages in the 'admin' section allow you to perform administrative tasks "
@@ -2579,7 +2644,7 @@
 "ohjelmien asennuksen, käyttäjähallinnon, asetuksien muokkaamisen, "
 "järjestelmän valvonnan, verkkoliikenteen tarkastelun jne."
 
-#: src/pkg_grouppolicy.cc:156
+#: src/pkg_grouppolicy.cc:158
 msgid ""
 "Packages converted from foreign formats (rpm, tgz, etc)\n"
 " Packages in the 'alien' section were created by the 'alien' program from a "
@@ -2589,7 +2654,7 @@
 " Alien-ryhmän paketit ovat alien-ohjelman luomia jostain muusta kuin "
 "Debianin käyttämästä pakettimuodosta (esim. RPM)."
 
-#: src/pkg_grouppolicy.cc:157
+#: src/pkg_grouppolicy.cc:159
 msgid ""
 "The Debian base system\n"
 " Packages in the 'base' section are part of the initial system installation."
@@ -2597,7 +2662,7 @@
 "Debianin perusta\n"
 " Base-ryhmän paketit ovat osa alkuperäistä asennusta."
 
-#: src/pkg_grouppolicy.cc:158
+#: src/pkg_grouppolicy.cc:160
 msgid ""
 "Programs for faxmodems and other communications devices\n"
 " Packages in the 'comm' section are used to control modems and other "
@@ -2612,7 +2677,7 @@
 "PPP:n käyttö Internet-yhteyteen puhelinlinjan välityksellä) sekä myös "
 "matkapuhelinten hallintaohjelmia, FidoNet-liittymän ja BBS-ohjelmistoja."
 
-#: src/pkg_grouppolicy.cc:159
+#: src/pkg_grouppolicy.cc:161
 msgid ""
 "Utilities and programs for software development\n"
 " Packages in the 'devel' section are used to write new software and work on "
@@ -2630,7 +2695,7 @@
 " Tämä ryhmä käsittää kääntäjiä, ohjelmointieditoreita, lähdekoodin "
 "käsittelytyökaluja ja muita ohjelmistokehitykseen liittyviä ohjelmia."
 
-#: src/pkg_grouppolicy.cc:160
+#: src/pkg_grouppolicy.cc:162
 msgid ""
 "Documentation and specialized programs for viewing documentation\n"
 " Packages in the 'doc' section document parts of the Debian system, or are "
@@ -2640,7 +2705,7 @@
 " Doc-ryhmän paketit sisältävät ohjeita Debian-järjestelmään tai sen osiin, "
 "tai ovat ohjetiedostojen katseluun tarkoitettuja ohjelmia."
 
-#: src/pkg_grouppolicy.cc:161
+#: src/pkg_grouppolicy.cc:163
 msgid ""
 "Text editors and word processors\n"
 " Packages in the 'editors' section allow you to edit plain ASCII text. These "
@@ -2652,7 +2717,7 @@
 "Tällaiset ohjelmat eivät välttämättä ole tekstinkäsittelyohjelmia, vaikka "
 "sellaisiakin tässä ryhmässä saattaa olla."
 
-#: src/pkg_grouppolicy.cc:162
+#: src/pkg_grouppolicy.cc:164
 msgid ""
 "Programs for working with circuits and electronics\n"
 " Packages in the 'electronics' section include circuit design tools, "
@@ -2662,7 +2727,7 @@
 " Electronics-ryhmä sisältää piirisuunnittelutyökaluja, mikro-ohjaimien "
 "simulaattoreita ja assemblereita ynnä muita elektroniikkaohjelmistoja."
 
-#: src/pkg_grouppolicy.cc:163
+#: src/pkg_grouppolicy.cc:165
 msgid ""
 "Programs for embedded systems\n"
 " Packages in the 'embedded' section are meant to run on embedded devices. "
@@ -2675,7 +2740,7 @@
 "on paljon pienempi kuin tavallisen pöytäkoneen. Esimerkkejä ovat "
 "kämmentietokoneet ja matkapuhelimet."
 
-#: src/pkg_grouppolicy.cc:164
+#: src/pkg_grouppolicy.cc:166
 msgid ""
 "The GNOME Desktop System\n"
 " GNOME is a collection of software which provides an easy-to-use desktop "
@@ -2687,7 +2752,7 @@
 "ohjelmistoja. Gnome-ryhmän paketit ovat joko osa GNOME-ympäristöä tai "
 "liittyvät siihen kiinteästi."
 
-#: src/pkg_grouppolicy.cc:165
+#: src/pkg_grouppolicy.cc:167
 msgid ""
 "Games, toys, and fun programs\n"
 " Packages in the 'games' section are meant primarily for entertainment."
@@ -2695,7 +2760,7 @@
 "Pelit ja muut hupiohjelmat\n"
 " Games-ryhmän paketit soveltuvat pääasiassa viihdekäyttöön."
 
-#: src/pkg_grouppolicy.cc:166
+#: src/pkg_grouppolicy.cc:168
 msgid ""
 "Utilities to create, view, and edit graphics files\n"
 " Packages in the 'graphics' section include viewers for image files, image "
@@ -2709,7 +2774,7 @@
 "digitaalikameroiden, yms.) käyttöön tarkoitettuja ohjelmia sekä "
 "ohjelmointityökaluja grafiikan käsittelyyn."
 
-#: src/pkg_grouppolicy.cc:167
+#: src/pkg_grouppolicy.cc:169
 msgid ""
 "Software for ham radio operators\n"
 " Packages in the 'hamradio' section are meant primarily for ham radio "
@@ -2718,7 +2783,7 @@
 "Radioamatööriohjelmat\n"
 " Hamradio-ryhmän paketit on tarkoitettu lähinnä radioamatööreille."
 
-#: src/pkg_grouppolicy.cc:168
+#: src/pkg_grouppolicy.cc:170
 msgid ""
 "Interpreters for interpreted languages\n"
 " Packages in the 'interpreters' section include interpreters for languages "
@@ -2728,7 +2793,7 @@
 " Interpreters-ryhmän paketit käsittävät tulkkeja eri ohjelmointikielille "
 "(esim. Python, Perl, Ruby) ja kirjastoja näille kielille."
 
-#: src/pkg_grouppolicy.cc:169
+#: src/pkg_grouppolicy.cc:171
 msgid ""
 "The KDE Desktop System\n"
 " KDE is a collection of software which provides an easy-to-use desktop "
@@ -2740,7 +2805,7 @@
 "ohjelmistoja. Kde-ryhmän paketit ovat joko osa KDE-ympäristöä tai liittyvät "
 "siihen kiinteästi."
 
-#: src/pkg_grouppolicy.cc:170
+#: src/pkg_grouppolicy.cc:172
 msgid ""
 "Development files for libraries\n"
 " Packages in the 'libdevel' section contain files required for building "
@@ -2752,7 +2817,7 @@
 "kehitettäessä Libs-ryhmän kirjastoja käyttäviä ohjelmia. Tarvitset tämän "
 "ryhmän paketteja vain, jos aiot itse kääntää ohjelmia."
 
-#: src/pkg_grouppolicy.cc:171
+#: src/pkg_grouppolicy.cc:173
 msgid ""
 "Collections of software routines\n"
 " Packages in the 'libs' section provide necessary functionality for other "
@@ -2766,7 +2831,7 @@
 "paketointijärjestelmä asentaa ne automaattisesti riippuvuuksien "
 "tyydyttämiseksi."
 
-#: src/pkg_grouppolicy.cc:172
+#: src/pkg_grouppolicy.cc:174
 msgid ""
 "Perl interpreter and libraries\n"
 " Packages in the 'perl' section provide the Perl programming language and "
@@ -2780,7 +2845,7 @@
 "paketteja käsin, sillä muissa tapauksissa paketointijärjestelmä asentaa ne "
 "automaattisesti tarvittaessa."
 
-#: src/pkg_grouppolicy.cc:173
+#: src/pkg_grouppolicy.cc:175
 msgid ""
 "Python interpreter and libraries\n"
 " Packages in the 'python' section provide the Python programming language "
@@ -2794,7 +2859,7 @@
 "ryhmän paketteja käsin, sillä muissa tapauksissa paketointijärjestelmä "
 "asentaa ne automaattisesti tarvittaessa."
 
-#: src/pkg_grouppolicy.cc:174
+#: src/pkg_grouppolicy.cc:176
 msgid ""
 "Programs to write, send, and route email messages\n"
 " Packages in the 'mail' section include mail readers, mail transport "
@@ -2806,7 +2871,7 @@
 "postilistojen pitoon, roskapostin suodatukseen sekä muuhunkin sähköpostiin "
 "liittyvään."
 
-#: src/pkg_grouppolicy.cc:175
+#: src/pkg_grouppolicy.cc:177
 msgid ""
 "Numeric analysis and other mathematics-related software\n"
 " Packages in the 'math' section include calculators, languages for "
@@ -2818,7 +2883,7 @@
 "tarkoitettuja kieliä, symbolisen laskennan ohjelmistoja ja ohjelmia "
 "matemaattisten olioiden hahmottamiseen."
 
-#: src/pkg_grouppolicy.cc:176
+#: src/pkg_grouppolicy.cc:178
 msgid ""
 "Miscellaneous software\n"
 " Packages in the 'misc' section have too unusual a function to be classified."
@@ -2827,7 +2892,7 @@
 " Misc-ryhmä sisältää epätavallisen käyttötarkoituksen vuoksi "
 "luokittelemattomat paketit."
 
-#: src/pkg_grouppolicy.cc:177
+#: src/pkg_grouppolicy.cc:179
 msgid ""
 "Programs to connect to and provide various services\n"
 " Packages in the 'net' section include clients and servers for many "
@@ -2839,7 +2904,7 @@
 "protokollille, työkaluja alhaisen tason verkkoprotokollien käsittelyyn ja "
 "vianpaikannukseen, pikaviestijärjestelmiä ja muita verkko-ohjelmistoja."
 
-#: src/pkg_grouppolicy.cc:178
+#: src/pkg_grouppolicy.cc:180
 msgid ""
 "Usenet clients and servers\n"
 " Packages in the 'news' section are related to the Usenet distributed news "
@@ -2849,7 +2914,7 @@
 " News-ryhmän paketit liittyvät Usenet News -järjestelmään.  Ryhmään kuuluu "
 "sekä lukimia että palvelimia."
 
-#: src/pkg_grouppolicy.cc:179
+#: src/pkg_grouppolicy.cc:181
 msgid ""
 "Obsolete libraries\n"
 " Packages in the 'oldlibs' section are obsolete and should not be used by "
@@ -2869,7 +2934,7 @@
 "paketointijärjestelmä asentaa ne automaattisesti riippuvuuksien "
 "tyydyttämiseksi."
 
-#: src/pkg_grouppolicy.cc:180
+#: src/pkg_grouppolicy.cc:182
 msgid ""
 "Emulators and software to read foreign filesystems\n"
 " Packages in the 'otherosfs' section emulate hardware and operating systems "
@@ -2887,7 +2952,7 @@
 " .\n"
 " Tämä ryhmä käsittää myös CD:iden poltto-ohjelmat."
 
-#: src/pkg_grouppolicy.cc:181
+#: src/pkg_grouppolicy.cc:183
 msgid ""
 "Software for scientific work\n"
 " Packages in the 'science' section include tools for astronomy, biology, and "
@@ -2897,7 +2962,7 @@
 " Science-ryhmän paketit käsittävät työkaluja astronomiaan, biologiaan, "
 "kemiaan sekä muuhunkiin tieteisiin liittyvään."
 
-#: src/pkg_grouppolicy.cc:182
+#: src/pkg_grouppolicy.cc:184
 msgid ""
 "Command shells and alternative console environments\n"
 " Packages in the 'shells' section include programs providing a command-line "
@@ -2906,7 +2971,7 @@
 "Komentotulkit ja pääteympäristöt\n"
 " Shells-ryhmän paketit sisältävät komentoriviympäristön tarjoavia ohjelmia."
 
-#: src/pkg_grouppolicy.cc:183
+#: src/pkg_grouppolicy.cc:185
 msgid ""
 "Utilities to play and record sound\n"
 " Packages in the 'sound' section include sound players, recorders, and "
@@ -2920,7 +2985,7 @@
 "äänilaitteiston hallintaohjelmia, sekä muita äänen- ja "
 "musiikinkäsittelyohjelmia."
 
-#: src/pkg_grouppolicy.cc:184
+#: src/pkg_grouppolicy.cc:186
 msgid ""
 "The TeX typesetting system\n"
 " Packages in the 'tex' section are related to TeX, a system for producing "
@@ -2934,7 +2999,7 @@
 "suunniteltuja editoreita, TeX:n käyttämien tiedostotyyppien muuntimia, "
 "kirjasimia TeX:lle sekä muita TeX:iin liittyviä ohjelmistoja."
 
-#: src/pkg_grouppolicy.cc:185
+#: src/pkg_grouppolicy.cc:187
 msgid ""
 "Text processing utilities\n"
 " Packages in the 'text' section include text filters and processors, "
@@ -2949,7 +3014,7 @@
 "tekstitiedostomuotojen välisiä muuntimia, tekstin muotoilimia ja muita "
 "paljaan tekstin käsittelyyn tarkoitettuja ohjelmistoja."
 
-#: src/pkg_grouppolicy.cc:186
+#: src/pkg_grouppolicy.cc:188
 msgid ""
 "Various system utilities\n"
 " Packages in the 'utils' section are utilities whose purpose is too unique "
@@ -2959,7 +3024,7 @@
 " Utils-ryhmän paketeilla on liian kapea käyttötarkoitus, jotta niitä voisi "
 "luokitella."
 
-#: src/pkg_grouppolicy.cc:187
+#: src/pkg_grouppolicy.cc:189
 msgid ""
 "Web browsers, servers, proxies, and other tools\n"
 " Packages in the 'web' section include Web browsers, Web servers and "
@@ -2971,7 +3036,7 @@
 "toimintojen kirjoittamiseen tarkoitettuja ohjelmia, seittipohjaisia ohjelmia "
 "ja muita WWW:hen liittyviä ohjelmia."
 
-#: src/pkg_grouppolicy.cc:188
+#: src/pkg_grouppolicy.cc:190
 msgid ""
 "The X window system and related software\n"
 " Packages in the 'x11' section include the core packages for the X window "
@@ -2983,7 +3048,7 @@
 "ikkunanhallintaohjelmia, X-hyötyohjelmia ja sekalaisia X-liittymää käyttäviä "
 "ohjelmia, jotka eivät sopineet muihin ryhmiin."
 
-#: src/pkg_grouppolicy.cc:190
+#: src/pkg_grouppolicy.cc:192
 msgid ""
 "Programs which depend on software not in Debian\n"
 " Packages in the 'contrib' section are not part of Debian.\n"
@@ -3009,7 +3074,7 @@
 " Saadaksesi lisätietoa, miten Debian ratkaisee ohjelmien vapauden, katso "
 "http://www.debian.org/social_contract#guidelines"
 
-#: src/pkg_grouppolicy.cc:191
+#: src/pkg_grouppolicy.cc:193
 msgid ""
 "The main Debian archive\n"
 " The Debian distribution consists of packages from the 'main' section. Every "
@@ -3025,7 +3090,7 @@
 " Saadaksesi lisätietoa, miten Debian ratkaisee ohjelmien vapauden, katso "
 "http://www.debian.org/social_contract#guidelines"
 
-#: src/pkg_grouppolicy.cc:192
+#: src/pkg_grouppolicy.cc:194
 msgid ""
 "Programs stored outside the US due to export controls\n"
 " Packages in 'non-US' likely contain cryptography; a few implement patented "
@@ -3048,7 +3113,7 @@
 "vientirajoitusten höllentämisten jälkeen.  Useimmat ennen tässä ryhmässä "
 "olleet paketit ovat siis nykyään main-ryhmässä."
 
-#: src/pkg_grouppolicy.cc:193
+#: src/pkg_grouppolicy.cc:195
 msgid ""
 "Programs which are not free software\n"
 " Packages in the 'non-free' section are not part of Debian.\n"
@@ -3064,11 +3129,14 @@
 "Epävapaat ohjelmat\n"
 " Non-free-ryhmän paketit eivät kuulu Debianiin.\n"
 " .\n"
-" Nämä ohjelmat eivät täytä Debianin vapaaohjelmistoille asettamia ehtoja.  Ennen kuin käytät näitä ohjelmia, lue lisenssiehdot varmistaaksesi, että haluamasi käyttötapa on sallittu.\n"
+" Nämä ohjelmat eivät täytä Debianin vapaaohjelmistoille asettamia ehtoja.  "
+"Ennen kuin käytät näitä ohjelmia, lue lisenssiehdot varmistaaksesi, että "
+"haluamasi käyttötapa on sallittu.\n"
 " .\n"
-" Saadaksesi lisätietoa, miten Debian ratkaisee ohjelmien vapauden, katso http://www.debian.org/social_contract#guidelines"
+" Saadaksesi lisätietoa, miten Debian ratkaisee ohjelmien vapauden, katso "
+"http://www.debian.org/social_contract#guidelines"
 
-#: src/pkg_grouppolicy.cc:195
+#: src/pkg_grouppolicy.cc:197
 msgid ""
 "Virtual packages\n"
 " These packages do not exist; they are names other packages use to require "
@@ -3078,27 +3146,27 @@
 " Näitä paketteja ei ole olemassa; ne ovat vain nimiä, jotka kertovat "
 "pakettien vaatimasta tai tarjoamasta toiminnallisuudesta.z"
 
-#: src/pkg_grouppolicy.cc:210
+#: src/pkg_grouppolicy.cc:212
 msgid "Tasks/Tasks"
 msgstr "Tehtävät/Tehtävät"
 
-#: src/pkg_grouppolicy.cc:210 src/pkg_grouppolicy.cc:937
+#: src/pkg_grouppolicy.cc:212 src/pkg_grouppolicy.cc:942
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: src/pkg_grouppolicy.cc:216
+#: src/pkg_grouppolicy.cc:218
 msgid "Unknown/Unknown"
 msgstr "Tuntematon/Tuntematon"
 
-#: src/pkg_grouppolicy.cc:222
+#: src/pkg_grouppolicy.cc:224
 msgid "virtual/virtual"
 msgstr "näennäinen/näennäinen"
 
-#: src/pkg_grouppolicy.cc:233
+#: src/pkg_grouppolicy.cc:235
 msgid "main"
 msgstr "main"
 
-#: src/pkg_grouppolicy.cc:318
+#: src/pkg_grouppolicy.cc:320
 msgid ""
 "Security Updates\n"
 " Security updates for these packages are available from security.debian.org."
@@ -3106,7 +3174,7 @@
 "Tietoturvapäivitykset\n"
 " Palvelimella security.debian.org on tietoturvapäivityksiä näille paketeille."
 
-#: src/pkg_grouppolicy.cc:319
+#: src/pkg_grouppolicy.cc:321
 msgid ""
 "Upgradable Packages\n"
 " A newer version of these packages is available."
@@ -3114,7 +3182,7 @@
 "Päivitettävät paketit\n"
 " Näistä paketeista on saatavilla uudempi versio."
 
-#: src/pkg_grouppolicy.cc:320
+#: src/pkg_grouppolicy.cc:322
 msgid ""
 "New Packages\n"
 " These packages have been added to Debian since the last time you cleared "
@@ -3122,9 +3190,11 @@
 "Actions menu to empty this list)."
 msgstr ""
 "Uudet paketit\n"
-" Nämä paketit on lisätty Debianiin sen jälkeen kun viimeksi tyhjensit uusien pakettien ryhmän.  Valitse \"Unohda uudet paketit\" Toiminnot-valikosta tyhjentääksesi tämän ryhmän."
+" Nämä paketit on lisätty Debianiin sen jälkeen kun viimeksi tyhjensit uusien "
+"pakettien ryhmän.  Valitse \"Unohda uudet paketit\" Toiminnot-valikosta "
+"tyhjentääksesi tämän ryhmän."
 
-#: src/pkg_grouppolicy.cc:321
+#: src/pkg_grouppolicy.cc:323
 msgid ""
 "Installed Packages\n"
 " These packages are currently installed on your computer."
@@ -3132,7 +3202,7 @@
 "Asennetut paketit\n"
 " Tietokoneellesi asennettuna olevat paketit."
 
-#: src/pkg_grouppolicy.cc:322
+#: src/pkg_grouppolicy.cc:324
 msgid ""
 "Not Installed Packages\n"
 " These packages are not installed on your computer."
@@ -3140,7 +3210,7 @@
 "Asentamattomat paketit\n"
 " Paketit, joita ei ole asennettu tietokoneellesi."
 
-#: src/pkg_grouppolicy.cc:323
+#: src/pkg_grouppolicy.cc:325
 msgid ""
 "Obsolete and Locally Created Packages\n"
 " These packages are currently installed on your computer, but they are not "
@@ -3153,7 +3223,7 @@
 "arkistoista vanhentuneina tai ne voivat olla itse kääntämiäsi paikallisia "
 "versioita."
 
-#: src/pkg_grouppolicy.cc:324
+#: src/pkg_grouppolicy.cc:326
 msgid ""
 "Virtual Packages\n"
 " These packages do not exist; they are names other packages use to require "
@@ -3163,7 +3233,7 @@
 " Näitä paketteja ei ole olemassa; ne ovat vain nimiä, jotka kertovat "
 "pakettien vaatimasta tai tarjoamasta toiminnallisuudesta."
 
-#: src/pkg_grouppolicy.cc:471
+#: src/pkg_grouppolicy.cc:473
 msgid ""
 "Packages which are recommended by other packages\n"
 " These packages are not strictly required, but they may be necessary to "
@@ -3175,7 +3245,7 @@
 "jotta nyt asentamasi tai päivittämäsi ohjelmat tarjoaisivat kaikki "
 "ominaisuutensa."
 
-#: src/pkg_grouppolicy.cc:491
+#: src/pkg_grouppolicy.cc:493
 msgid ""
 "Packages which are suggested by other packages\n"
 " These packages are not required in order to make your system function "
@@ -3187,7 +3257,7 @@
 "voivat antaa ylimääräistä toiminnallisuutta joillekin ohjelmille, joita olet "
 "nyt asentamassa."
 
-#: src/pkg_grouppolicy.cc:518
+#: src/pkg_grouppolicy.cc:520
 msgid ""
 "Packages with unsatisfied dependencies\n"
 " The dependency requirements of these packages will be unmet after the "
@@ -3200,7 +3270,7 @@
 " 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/pkg_grouppolicy.cc:519
+#: src/pkg_grouppolicy.cc:521
 msgid ""
 "Packages being removed because they are no longer used\n"
 " These packages are being deleted because they were automatically installed "
@@ -3212,7 +3282,7 @@
 "riippuvuuksia tyydyttääkseen, ja halutun toimenpiteen jälkeen näihin "
 "paketteihin ei ole enää 'tärkeitä' riippuvuuksia.\n"
 
-#: src/pkg_grouppolicy.cc:520
+#: src/pkg_grouppolicy.cc:522
 msgid ""
 "Packages being automatically held in their current state\n"
 " These packages could be upgraded, but they have been kept in their current "
@@ -3222,7 +3292,7 @@
 " Näille paketeille on olemassa uudempi versio, mutta ne jäädytetään "
 "nykyiseen versioonsa, jotta riippuvuudet eivät rikkoontuisi."
 
-#: src/pkg_grouppolicy.cc:521
+#: src/pkg_grouppolicy.cc:523
 msgid ""
 "Packages being automatically installed to satisfy dependencies\n"
 " These packages are being installed because they are required by another "
@@ -3232,7 +3302,7 @@
 " Nämä paketit asennetaan, koska jokin asennettavaksi valitsemasi paketti "
 "riippuu niistä."
 
-#: src/pkg_grouppolicy.cc:522
+#: src/pkg_grouppolicy.cc:524
 msgid ""
 "Packages being deleted due to unsatisfied dependencies\n"
 " These packages are being deleted because one or more of their dependencies "
@@ -3242,16 +3312,17 @@
 " Nämä paketit poistetaan, koska jokin niiden riippuvuuksista ei ole enää "
 "saatavilla, tai koska jokin toinen paketti on ristiriidassa niiden kanssa."
 
-#: src/pkg_grouppolicy.cc:523
+#: src/pkg_grouppolicy.cc:525
 msgid ""
 "Packages to be downgraded\n"
 " An older version of these packages than is currently installed will be "
 "installed."
 msgstr ""
 "Vanhennettavat paketit\n"
-" Näistä paketeista asennetaan vanhempi versio kuin tällä hetkellä asennettuna oleva."
+" Näistä paketeista asennetaan vanhempi versio kuin tällä hetkellä "
+"asennettuna oleva."
 
-#: src/pkg_grouppolicy.cc:524
+#: src/pkg_grouppolicy.cc:526
 msgid ""
 "Packages being held back\n"
 " These packages could be upgraded, but you have asked for them to be held at "
@@ -3260,7 +3331,7 @@
 "Jäädytetyt paketit\n"
 " Näille paketeille on olemassa uudempi versio, mutta olet jäädyttänyt ne."
 
-#: src/pkg_grouppolicy.cc:525
+#: src/pkg_grouppolicy.cc:527
 msgid ""
 "Packages to be reinstalled\n"
 " These packages will be reinstalled."
@@ -3268,7 +3339,7 @@
 "Uudelleenasennettavat paketit\n"
 " Nämä paketit asennetaan uudelleen."
 
-#: src/pkg_grouppolicy.cc:526
+#: src/pkg_grouppolicy.cc:528
 msgid ""
 "Packages to be installed\n"
 " These packages have been manually selected for installation on your "
@@ -3277,7 +3348,7 @@
 "Asennettavat paketit\n"
 " Nämä paketit on käsin valittu asennettaviksi."
 
-#: src/pkg_grouppolicy.cc:527
+#: src/pkg_grouppolicy.cc:529
 msgid ""
 "Packages to be removed\n"
 " These packages have been manually selected for removal."
@@ -3285,7 +3356,7 @@
 "Poistettavat paketit\n"
 " Nämä paketit on käsin valittu poistettaviksi."
 
-#: src/pkg_grouppolicy.cc:528
+#: src/pkg_grouppolicy.cc:530
 msgid ""
 "Packages to be upgraded\n"
 " These packages will be upgraded to a newer version."
@@ -3293,44 +3364,48 @@
 "Päivitettävät paketit\n"
 " Nämä paketit päivitetään uudempaan versioon."
 
-#: src/pkg_grouppolicy.cc:643
+#: src/pkg_grouppolicy.cc:645
 msgid "unknown"
 msgstr "tuntematon"
 
-#: src/pkg_grouppolicy.cc:654
+#: src/pkg_grouppolicy.cc:656
 #, c-format
 msgid "Priority %s"
 msgstr "Tärkeys %s"
 
-#: src/pkg_grouppolicy.cc:880
+#: src/pkg_grouppolicy.cc:766
+msgid "UNCATEGORIZED"
+msgstr ""
+
+#: src/pkg_grouppolicy.cc:885
 msgid "End-user"
 msgstr "Loppukäyttäjä"
 
-#: src/pkg_grouppolicy.cc:881
+#: src/pkg_grouppolicy.cc:886
 msgid "Servers"
 msgstr "Palvelimet"
 
-#: src/pkg_grouppolicy.cc:882
+#: src/pkg_grouppolicy.cc:887
 msgid "Development"
 msgstr "Ohjelmakehitys"
 
-#: src/pkg_grouppolicy.cc:883
+#: src/pkg_grouppolicy.cc:888
 msgid "Localization"
 msgstr "Paikallistaminen"
 
-#: src/pkg_grouppolicy.cc:884
+#: src/pkg_grouppolicy.cc:889
 msgid "Hardware Support"
 msgstr "Laitteistotuki"
 
-#: src/pkg_grouppolicy.cc:885
+#: src/pkg_grouppolicy.cc:890
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: src/pkg_grouppolicy.cc:886
+#: src/pkg_grouppolicy.cc:891
 msgid "Unrecognized tasks"
 msgstr "Tunnistamattomat tehtävät"
 
-#: src/pkg_grouppolicy.cc:937
+#: src/pkg_grouppolicy.cc:943
 msgid ""
 "\n"
 " Tasks are groups of packages which provide an easy way to select a "
@@ -3366,79 +3441,83 @@
 msgid "Versions"
 msgstr "Versiot"
 
-#: src/pkg_item.cc:55
+#: src/pkg_item.cc:56
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Kyllä, tiedän hyvin, että tämä on aivan onnettoman surkea ajatus"
 
-#: src/pkg_item.cc:80
+#: src/pkg_item.cc:81
 #, c-format
 msgid ""
 "%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
 "s' if you are."
-msgstr "%s on välttämätön paketti!%n%nOletko aivan varma, että haluat poistaa sen?%nKirjoita '%s' jos olet."
+msgstr ""
+"%s on välttämätön paketti!%n%nOletko aivan varma, että haluat poistaa sen?%"
+"nKirjoita '%s' jos olet."
 
-#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
+#: src/pkg_item.cc:221 src/pkg_ver_item.cc:633
 #, c-format
 msgid "Information about %s"
 msgstr "%s:n tiedot"
 
-#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
+#: src/pkg_item.cc:223 src/pkg_ver_item.cc:635
 #, c-format
 msgid "%s info"
 msgstr "%s: tiedot"
 
-#: src/pkg_item.cc:308
+#: src/pkg_item.cc:309
 #, c-format
 msgid "Available versions of %s"
 msgstr "Paketin %s saatavilla olevat versiot"
 
-#: src/pkg_item.cc:311
+#: src/pkg_item.cc:312
 #, c-format
 msgid "%s versions"
 msgstr "%s: versiot"
 
-#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
+#: src/pkg_item.cc:324 src/pkg_ver_item.cc:663
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s:n riippuvuudet"
 
-#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
+#: src/pkg_item.cc:326 src/pkg_ver_item.cc:665
 #, c-format
 msgid "%s deps"
 msgstr "%s: riippuvuudet"
 
-#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
+#: src/pkg_item.cc:337 src/pkg_ver_item.cc:675
 #, c-format
 msgid "Packages depending on %s"
 msgstr "%s:sta riippuvat paketit"
 
-#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
+#: src/pkg_item.cc:339 src/pkg_ver_item.cc:677
 #, c-format
 msgid "%s reverse deps"
 msgstr "%s: käänteisriippuvuudet"
 
-#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
+#: src/pkg_item.cc:391 src/pkg_ver_item.cc:715
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Ilmoitetaan viasta paketissa %s:\n"
 
-#: src/pkg_item.cc:412
+#: src/pkg_item.cc:413
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
 "this package, install the menu package, the login package, or run aptitude "
 "as root."
-msgstr "Et ole root enkä tiedä miten voisit päästä rootiksi.  Jotta voisit muokata asetuksia, asenna menu- tai login-paketti tai aja aptitudea root-tunnuksella."
+msgstr ""
+"Et ole root enkä tiedä miten voisit päästä rootiksi.  Jotta voisit muokata "
+"asetuksia, asenna menu- tai login-paketti tai aja aptitudea root-tunnuksella."
 
-#: src/pkg_item.cc:420
+#: src/pkg_item.cc:421
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Asetan uudelleen pakettia %s\n"
 
-#: src/pkg_item.cc:445
+#: src/pkg_item.cc:446
 msgid "Hierarchy editor"
 msgstr "Hierarkiamuokkain"
 
-#: src/pkg_item.cc:445
+#: src/pkg_item.cc:446
 msgid "Hierarchy Editor"
 msgstr "Hierarkiamuokkain"
 
@@ -3446,47 +3525,61 @@
 msgid "Search for: "
 msgstr "Etsi mitä? "
 
-#: src/pkg_tree.cc:568
+#: src/pkg_tree.cc:579
 msgid "All Packages"
 msgstr "Kaikki paketit"
 
-#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
+#: src/pkg_tree.cc:592 src/pkg_tree.cc:603
 msgid "Building view"
 msgstr "Rakennan näkymää"
 
-#: src/pkg_tree.cc:632
-#, c-format
-msgid "No packages matched the pattern \"%s\"."
+#: src/pkg_tree.cc:646
+#, fuzzy, c-format
+msgid "No packages matched the pattern \"%ls\"."
 msgstr "Mikään paketti ei täsmännyt hakuehtoon \"%s\"."
 
-#: src/pkg_tree.cc:654
+#: src/pkg_tree.cc:668
 msgid "Enter the new package tree limit: "
 msgstr "Syötä pakettipuulle uusi raja: "
 
-#: src/pkg_tree.cc:688
+#: src/pkg_tree.cc:702
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr "Syötä uusi ryhmittelytapa tälle näytölle: "
 
-#: src/pkg_tree.cc:696
+#: src/pkg_tree.cc:710
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Syötä uusi pakettien lajittelutapa tälle näytölle: "
 
-#: src/pkg_view.cc:359
+#: src/pkg_view.cc:133
+msgid "Couldn't transcode column definition"
+msgstr ""
+
+#: src/pkg_view.cc:140
+#, fuzzy
+msgid "Couldn't parse column definition"
+msgstr "En pysty kirjoittamaan tiedostoon"
+
+#: src/pkg_view.cc:158
+#, fuzzy
+msgid "Encoding error in long description."
+msgstr "Pariton '(' lajittelutyylin kuvauksessa"
+
+#: src/pkg_view.cc:370
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: virhe argumenteissa -- kaksi päähärpätintä??"
 
-#: src/pkg_view.cc:365
+#: src/pkg_view.cc:376
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: virhe argumenteissa -- väärä sarakelista kiinteälle "
 "alkiolle"
 
-#: src/pkg_view.cc:458
+#: src/pkg_view.cc:469
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: tuhma argumentti!"
 
-#: src/pkg_view.cc:510
+#: src/pkg_view.cc:521
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: päähärpätintä ei löydy"
 
@@ -3730,7 +3823,9 @@
 msgid ""
 "Time exhausted while searching for a solution (you can select \"Next Solution"
 "\" or press %s to try harder)."
-msgstr "Ratkaisun etsintään annettu aika loppui (voit valita \"Seuraava ratkaisu\" tai paina %s yrittääksesi pitempään)."
+msgstr ""
+"Ratkaisun etsintään annettu aika loppui (voit valita \"Seuraava ratkaisu\" "
+"tai paina %s yrittääksesi pitempään)."
 
 #: src/solution_dialog.cc:146
 msgid "Previous"
@@ -3786,7 +3881,9 @@
 "%F: This version of %s is from an %Buntrusted source%b!  Installing this "
 "package could allow a malicious individual to damage or take control of your "
 "system."
-msgstr "%F: Tämä paketin %s versio %Bei%b ole luotettavasta lähteestä!  Paketin asennus voi mahdollistaa järjestelmäsi vaurioittamisen tai kaappauksen."
+msgstr ""
+"%F: Tämä paketin %s versio %Bei%b ole luotettavasta lähteestä!  Paketin "
+"asennus voi mahdollistaa järjestelmäsi vaurioittamisen tai kaappauksen."
 
 #: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
@@ -3800,592 +3897,671 @@
 msgid "W:"
 msgstr "Varoitus:"
 
-#: src/ui.cc:193
+#: src/ui.cc:187
 msgid "Search for:"
 msgstr "Etsi mitä? "
 
-#: src/ui.cc:258
+#: src/ui.cc:252
 msgid "You already are root!"
 msgstr "Olet jo root!"
 
-#: src/ui.cc:356
+#: src/ui.cc:350
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Lapsiprosessi palautti virhekoodin -- kirjoititko salasanan oikein?"
 
-#: src/ui.cc:384
+#: src/ui.cc:378
 msgid "Loading cache"
 msgstr "Lataan varastoa"
 
-#: src/ui.cc:406
+#: src/ui.cc:400
 msgid "Really quit Aptitude?"
 msgstr "Haluatko varmasti lopettaa?"
 
-#: src/ui.cc:485
+#: src/ui.cc:479
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Haluatko varmasti hylätä omat asetuksesi ja korvata ne oletuksilla?"
 
-#: src/ui.cc:585 src/ui.cc:587 src/ui.cc:615 src/ui.cc:617
+#: src/ui.cc:579 src/ui.cc:581 src/ui.cc:609 src/ui.cc:611
 msgid "Packages"
 msgstr "Paketit"
 
-#: src/ui.cc:586 src/ui.cc:616
+#: src/ui.cc:580 src/ui.cc:610
 msgid "View available packages and choose actions to perform"
 msgstr "Selaa saatavilla olevia paketteja ja suorita toimenpiteitä"
 
-#: src/ui.cc:663
+#: src/ui.cc:657
 msgid ""
 "Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
 "is free software, and you are welcome to redistribute it under certain "
 "conditions; see 'license' for details."
-msgstr "Aptitude %s%n%nTehnyt Daniel Burrows vuonna 2000.%n%nAptitudella %BEI OLE TAKUUTA%b; yksityiskohdat näet valitsemalla 'lisenssi' Avustus-valikosta.  Tämä on vapaa ohjelma, joten saat vapaasti levittää sitä tietyin rajoituksin; 'lisenssi' antaa tarkemmat tiedot (englanniksi)."
+msgstr ""
+"Aptitude %s%n%nTehnyt Daniel Burrows vuonna 2000.%n%nAptitudella %BEI OLE "
+"TAKUUTA%b; yksityiskohdat näet valitsemalla 'lisenssi' Avustus-valikosta.  "
+"Tämä on vapaa ohjelma, joten saat vapaasti levittää sitä tietyin "
+"rajoituksin; 'lisenssi' antaa tarkemmat tiedot (englanniksi)."
 
-#: src/ui.cc:684
+#: src/ui.cc:678
 msgid "help.txt"
 msgstr "help-fi.txt"
 
-#: src/ui.cc:700
+#: src/ui.cc:680
+msgid "Encoding of help.txt|UTF-8"
+msgstr ""
+
+#: src/ui.cc:699
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:782
+#: src/ui.cc:701
+msgid "Encoding of README|UTF-8"
+msgstr ""
+
+#: src/ui.cc:787
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!%"
 "n%nUntrusted packages could %Bcompromise your system's security%b.  You "
 "should only proceed with the installation if you are certain that this is "
 "what you want to do.%n%n"
-msgstr "%BVAROITUS%b: allaolevien pakettien asennettavat versiot eivät ole luotettuja!%n%nEpäluotettavat paketit voivat %Bvaarantaa järjestelmäsi turvallisuuden%b.  Sinun ei pitäisi jatkaa, ellet ole varma, että asennettavat versiot ovat kunnollisia.%n%n"
+msgstr ""
+"%BVAROITUS%b: allaolevien pakettien asennettavat versiot eivät ole "
+"luotettuja!%n%nEpäluotettavat paketit voivat %Bvaarantaa järjestelmäsi "
+"turvallisuuden%b.  Sinun ei pitäisi jatkaa, ellet ole varma, että "
+"asennettavat versiot ovat kunnollisia.%n%n"
 
-#: src/ui.cc:788
+#: src/ui.cc:793
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versio %s]%n"
 
-#: src/ui.cc:795
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Jatka"
 
-#: src/ui.cc:797
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Keskeytä asennus"
 
-#: src/ui.cc:858
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Pakettien asennuksen esikatselu"
 
-#: src/ui.cc:859
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Näytä toiminnot, jotka suoritetaan, ja muuta niitä"
 
-#: src/ui.cc:860
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: src/ui.cc:896
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Jotkut paketit olivat rikki, mutta ovat nyt kunnossa:"
 
-#: src/ui.cc:902
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Näitä riippuvuusongelmia ei ole mahdollista ratkaista!"
 
-#: src/ui.cc:908
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
-msgstr "Riippuvuuksien ratkaisuun annettu aika loppui (paina \"%s\" yrittääksesi pitempään)"
+msgstr ""
+"Riippuvuuksien ratkaisuun annettu aika loppui (paina \"%s\" yrittääksesi "
+"pitempään)"
 
-#: src/ui.cc:954
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
-msgstr "Pakettien asentaminen ja poisto vaativat ylläpitäjän oikeudet, joita sinulla ei ole.  Haluatko vaihtaa root-tunnukselle?"
+msgstr ""
+"Pakettien asentaminen ja poisto vaativat ylläpitäjän oikeudet, joita sinulla "
+"ei ole.  Haluatko vaihtaa root-tunnukselle?"
 
-#: src/ui.cc:957 src/ui.cc:1072
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Vaihda root-tunnukselle"
 
-#: src/ui.cc:959 src/ui.cc:1074
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Älä vaihda root-tunnukselle"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Asennus tai pakettiluettelon päivitys on jo käynnissä."
 
-#: src/ui.cc:991
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Mitään paketteja ei asenneta, päivitetä tai poisteta."
 
-#: src/ui.cc:997
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
 "upgrade."
-msgstr "Mitään paketteja ei asenneta, poisteta tai päivitetä.  Jotkin paketit olisi mahdollista päivittää.  Paina \"U\" päivittääksesi nämä."
+msgstr ""
+"Mitään paketteja ei asenneta, poisteta tai päivitetä.  Jotkin paketit olisi "
+"mahdollista päivittää.  Paina \"U\" päivittääksesi nämä."
 
-#: src/ui.cc:1069
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
-msgstr "Pakettiluettelon päivitys vaatii ylläpitäjän oikeudet, joita sinulla ei ole.  Haluatko vaihtaa root-tunnukselle?"
+msgstr ""
+"Pakettiluettelon päivitys vaatii ylläpitäjän oikeudet, joita sinulla ei "
+"ole.  Haluatko vaihtaa root-tunnukselle?"
 
-#: src/ui.cc:1084 src/ui.cc:1371
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Hukkaa aikaa etsimällä miinoja"
 
-#: src/ui.cc:1091 src/ui.cc:1144
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Puhdistusta ei voi tehdä noudon aikana"
 
-#: src/ui.cc:1094
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Poistan noudettuja tiedostoja"
 
-#: src/ui.cc:1108
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Noudetut pakettitiedostot on poistettu"
 
-#: src/ui.cc:1169
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Vanhentuneet pakettitiedostot on poistettu, %sB levytilaa vapautui."
 
-#: src/ui.cc:1241
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Kaikki ratkaisut käyty läpi."
 
-#: src/ui.cc:1246 src/ui.cc:1277
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Ratkaisun etsintään annettu aika loppui."
 
-#: src/ui.cc:1271
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Toteutettavaa ratkaisua ei löytynyt."
 
-#: src/ui.cc:1301
-#, c-format
-msgid "Unable to open %s"
+#: src/ui.cc:1305
+#, fuzzy, c-format
+msgid "Unable to open %ls"
 msgstr "En pysty kirjoittamaan tiedostoon %s"
 
-#: src/ui.cc:1307
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Selvityksen tilan tallennuksessa tapahtui virhe"
 
-#: src/ui.cc:1317
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Mihin tiedostoon selvityksen tila tallennetaan? "
 
-#: src/ui.cc:1347
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Asenna/poista paketteja"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Suorita kaikki määritetyt asennukset ja poistot"
 
-#: src/ui.cc:1350
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Päivitä pakettiluettelo"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Päivitä saatavilla olevien pakettien luettelo"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Unohda uudet paketit"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Tyhjennä uusien pakettien ryhmä"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Puhdista ^koko pakettivarasto"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Poista aiemmin noudetut pakettitiedostot"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Puhdista ^vanhentuneet tiedostot"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Poista pakettitiedostot, joita ei enää voi noutaa"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "^Merkitse päivitykset"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1371
 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/ui.cc:1370
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "Pelaa miina^haravaa"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Vaihda ^root-tunnukselle"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
-msgstr "Vaihda root-tunnukselle komennolla 'su'.  Tämä käynnistää ohjelman uudelleen, mutta asetuksesi säilyvät nykyisellään."
+msgstr ""
+"Vaihda root-tunnukselle komennolla 'su'.  Tämä käynnistää ohjelman "
+"uudelleen, mutta asetuksesi säilyvät nykyisellään."
 
-#: src/ui.cc:1377
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "Lataa ^pakettivarasto uudelleen"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Lataa pakettivarasto uudelleen muistiin."
 
-#: src/ui.cc:1384
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Lopeta"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: src/ui.cc:1391 src/ui.cc:1661
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Peruuta"
 
-#: src/ui.cc:1392
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Peruuta viimeisin suoritettu toimi tai toimiryhmä"
 
-#: src/ui.cc:1399
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Asenna"
 
-#: src/ui.cc:1400
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merkitse valittu paketti asennettavaksi tai päivitettäväksi"
 
-#: src/ui.cc:1403
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Poista"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Merkitse valittu paketti poistettavaksi"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Siivoa"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Merkitse valittu paketti asetustiedostoineen poistettavaksi"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "Pala^uta"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Peruuta valitulle paketille määritetyt toiminnot"
 
-#: src/ui.cc:1415
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Jäädytä"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "Peruuta valitulle paketille määritetyt toiminnot ja estä sen päivitys"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "^Merkitse Automaatti"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
-msgstr "Merkitse valittu paketti automaattisesti asennetuksi; se poistetaan, jos mikään muu paketti ei riipu siitä"
+msgstr ""
+"Merkitse valittu paketti automaattisesti asennetuksi; se poistetaan, jos "
+"mikään muu paketti ei riipu siitä"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Merkitse ^Käsin"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
-msgstr "Merkitse valittu paketti käsin asennetuksi; sitä ei poisteta, ellet poista sitä käsin"
+msgstr ""
+"Merkitse valittu paketti käsin asennetuksi; sitä ei poisteta, ellet poista "
+"sitä käsin"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Estä versio"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
-msgstr "Estä valitun paketin ehdolla olevan version asennus; paketin uudemmat versiot asennetaan normaalisti"
+msgstr ""
+"Estä valitun paketin ehdolla olevan version asennus; paketin uudemmat "
+"versiot asennetaan normaalisti"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "^Tiedot"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Näytä lisätietoa valitusta paketista"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "Muutos^loki"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Näytä valitun paketin Debian-muutosloki"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Etsi"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Etsi pakettia"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Etsi ^Uudestaan"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Toista edellinen haku"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Rajoita Näkymä"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Rajoita näkyvien pakettien luetteloa suodattimella"
 
-#: src/ui.cc:1457
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Laajenna Näkymä"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Poista pakettiluettelon suodatin"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "^Hae rikkinäiset"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Etsi seuraava paketti, jonka riippuvuudet eivät ole kunnossa"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^Käyttöliittymä"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Muuta käyttöliittymään vaikuttavia asetuksia"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Riippuvuuksien käsittely"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Muuta pakettien riippuvuuksien käsittelyyn vaikuttavia asetuksia"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Sekalaista"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Muuta sekalaisia asetuksia"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Palauta oletukset"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Palauta kaikki asetukset ohjelman oletusasetuksiin"
 
-#: src/ui.cc:1496
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Seuraava"
 
-#: src/ui.cc:1497
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Siirry seuraavaan näkymään"
 
-#: src/ui.cc:1500
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Edellinen"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Siirry edelliseen näkymään"
 
-#: src/ui.cc:1504
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "Su^lje"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Sulje tämä näkymä"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Uusi paketti^näkymä"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Luo uusi oletusnäkymä"
 
-#: src/ui.cc:1514
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "^Uusi luokkaselain"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Selaa paketteja luokittain"
 
-#: src/ui.cc:1524
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Tietoja"
 
-#: src/ui.cc:1525
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Tietoja tästä ohjelmasta"
 
-#: src/ui.cc:1528
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Pika-apu"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Selaa sisäänrakennettua avustustekstiä"
 
-#: src/ui.cc:1531
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Käyttöopas"
 
-#: src/ui.cc:1532
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Näytä ohjelman varsinainen käyttöohje"
 
-#: src/ui.cc:1535
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^UKK"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Näytä usein kysyttyjä kysymyksiä vastauksineen"
 
-#: src/ui.cc:1539
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "UUTISET"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Näytä tärkeät muutokset, jotka on tehty kuhunkin versioon paketista "
 
-#: src/ui.cc:1543
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Lisenssi"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Näytä ohjelman kopiointiehdot"
 
-#: src/ui.cc:1660
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: src/ui.cc:1663
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Haku"
 
-#: src/ui.cc:1664
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Asetukset"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Näkymät"
 
-#: src/ui.cc:1666
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Apu"
 
-#: src/ui.cc:1726
-#, c-format
+#: src/ui.cc:1730
+#, fuzzy, c-format
 msgid ""
-"%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
+"%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
+"Pkgs"
 msgstr "%s: Valikko  %s: Apu  %s: Lopeta  %s: Päivitä  %s: Nouda/Asenna/Poista"
 
-#: src/ui.cc:1996 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "kyllä"
 
-#: src/ui.cc:1997 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "ei"
 
-#: src/view_changelog.cc:61
+#: src/view_changelog.cc:63
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla."
 
-#: src/view_changelog.cc:67
+#: src/view_changelog.cc:69
 msgid "Downloading Changelog"
 msgstr "Noudan muutoslokia"
 
-#: src/view_changelog.cc:69
+#: src/view_changelog.cc:71
 msgid "Download Changelog"
 msgstr "Nouda muutosloki"
 
-#: src/view_changelog.cc:78
+#: src/view_changelog.cc:81
 #, c-format
 msgid "%s changes"
 msgstr "%s: muutokset"
 
-#: src/vscreen/vscreen.cc:119
+#: src/vscreen/config/column_definition.cc:93
+#: src/vscreen/config/column_definition.cc:108
+msgid "Formatting marker with missing format code"
+msgstr ""
+
+#: src/vscreen/config/column_definition.cc:117
+#, c-format
+msgid "Bad number in format string: '%ls'"
+msgstr ""
+
+#: src/vscreen/config/column_definition.cc:137
+#, fuzzy, c-format
+msgid "Unknown formatting code '%lc'"
+msgstr "Tuntematon hahmotyyppi: %c"
+
+#: src/vscreen/config/keybindings.cc:314
+#, fuzzy, c-format
+msgid "Cannot parse key description: %ls"
+msgstr "Luen tehtäväkuvauksia"
+
+#: src/vscreen/config/keybindings.cc:324
+#, fuzzy
+msgid "Invalid null keybinding"
+msgstr "Virheellinen alkio \"%s\" näppäinsidontaryhmässä"
+
+#: src/vscreen/config/keybindings.cc:332
+msgid "Sorry, control modifiers may not be used with unprintable characters"
+msgstr ""
+
+#: src/vscreen/vscreen.cc:120
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
 msgstr "Auts!  Tuli SIGTERM, kuolen..\n"
 
-#: src/vscreen/vscreen.cc:122
+#: src/vscreen/vscreen.cc:123
 #, c-format
 msgid "Ouch!  Got SIGSEGV, dying..\n"
 msgstr "Auts!  Tuli SIGSEGV, kuolen..\n"
 
-#: src/vscreen/vscreen.cc:125
+#: src/vscreen/vscreen.cc:126
 #, c-format
 msgid "Ouch!  Got SIGABRT, dying..\n"
 msgstr "Auts!  Tuli SIGABRT, kuolen..\n"
 
-#: src/vscreen/vscreen.cc:128
+#: src/vscreen/vscreen.cc:129
 #, c-format
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Auts!  Tuli SIGQUIT, kuolen..\n"
 
+#: src/vscreen/vs_pager.cc:397
+#, c-format
+msgid ""
+"Unable to load filename: the string %ls has no multibyte representation."
+msgstr ""
+
+#: src/vscreen/vs_tree.cc:793
+msgid "TOP LEVEL"
+msgstr ""
+
+#~ msgid "Warning: could not lock the cache file.  Opening in read-only mode"
+#~ msgstr ""
+#~ "Varoitus: varaston lukitus epäonnistui, joten siihen ei nyt voi kirjoittaa"
+
+#~ msgid "The number of mines must be a number"
+#~ msgstr "Miinojen lukumäärän on oltava luku"
+
 #~ msgid ""
 #~ "Commands:\n"
 #~ "  y: continue with the installation\n"

Modified: branches/aptitude-0.3/aptitude/po/fr.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/fr.po	(original)
+++ branches/aptitude-0.3/aptitude/po/fr.po	Wed Jul  6 22:10:50 2005
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.14.1\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-05-25 20:42+0200\n"
 "Last-Translator: Jean-Luc Coulon <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -957,70 +957,74 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Les paquets suivants ont des dépendances non satisfaites :\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Les paquets suivants sont CASSÉS : "
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Impossible d'ouvrir %s en écriture"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Erreur lors de l'écriture du fichier d'état"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Réponse incorrecte. Veuillez entrer une commande correcte ou « ? » pour "
 "obtenir de l'aide.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Réponse incorrecte. Veuillez entrer une commande correcte ou « ? » pour "
 "obtenir de l'aide.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "recherche : vous devez donner au moins un terme de recherche\n"
@@ -1324,7 +1328,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Impossible de nettoyer l'index des listes"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Effacement des fichiers téléchargés périmés"
 
@@ -2285,7 +2289,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Démineur"
 
@@ -2504,7 +2508,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paquet"
 
@@ -4154,37 +4158,37 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Versions"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Continuer malgré tout"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Abandon de l'installation"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Pré-visualisation de l'installation des paquets"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Voir ou modifier les actions qui seront effectuées"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^Précédent"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Certains paquets étaient cassés et ont été réparés"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4193,7 +4197,7 @@
 "Passer le temps en essayant de trouver les mines\n"
 "(il y a certainement mieux à faire)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4203,25 +4207,25 @@
 "d'administration que vous n'avez pas pour le moment. Voulez-vous\n"
 "utiliser le compte administrateur ?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Devenir administrateur"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Ne pas devenir administrateur"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Une mise à jour de la liste des paquets ou une installation est déjà en "
 "cours."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Il n'est prévu d'installer, mettre à jour ou enlever aucun paquet."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4233,7 +4237,7 @@
 "Certains paquets pourraient être mis à jour mais vous avez choisi de ne pas\n"
 "le faire. Entrez « U » pour préparer une mise à jour."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4243,121 +4247,121 @@
 "que vous n'avez pas pour le moment. Voulez-vous utiliser le compte\n"
 "administrateur ?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr ""
 "Passer le temps en essayant de trouver les mines\n"
 "(il y a certainement mieux à faire)"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 "Il n'est pas autorisé d'effectuer un nettoyage alors qu'un téléchargement "
 "est en cours"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Effacement des fichiers téléchargés"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr " Les fichiers téléchargés ont été effacés "
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr " Les fichiers téléchargés de paquets périmés ont été effacés "
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 "Passer le temps en essayant de trouver les mines\n"
 "(il y a certainement mieux à faire)"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Impossible d'ouvrir %s en écriture"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Installer/enlever des paquets"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr ""
 "Effectuer toutes les actions d'installation ou de suppression demandées"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Mettre à jour les listes de paquets"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Vérifier s'il existe de nouvelles versions des paquets"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Oublier les nouveaux paquets"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Oublier quels paquets sont « nouveaux »"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Nettoyer le cache des paquets"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Effacer les fichiers de paquets précédemment téléchargés"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Nettoyer les fichiers ^périmés"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 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/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Marquer comme étant susceptible de mise à ^jour"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marquer tous les paquets susceptibles d'être mis à jour et qui ne sont pas "
 "gelés pour mise à jour"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "Jouer au ^démineur"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Devenir ^administrateur"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4366,70 +4370,70 @@
 "Utilisez la commande « su » pour devenir administrateur.\n"
 "Cela relancera le programme mais vos préférences seront conservées"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Recharger le cache des paquets"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Recharger le cache des paquets"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Quitter"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Quitter le programme"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 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/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marquer le paquet sélectionné pour installation ou mise à jour"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Supprimer"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Marquer le paquet sélectionné pour suppression"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Purger"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marquer le paquet sélectionné et ses fichiers de configuration pour "
 "suppression"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Garder"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Annuler toute action sur le paquet sélectionné"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "G^eler"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4437,11 +4441,11 @@
 "Annuler toute action sur le paquet sélectionné et refuser toute mise à jour "
 "ultérieure"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Marquer ^automatique"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4450,11 +4454,11 @@
 "Marquer le paquet choisi comme ayant été automatiquement installé ;\n"
 "il sera supprimé automatiquement si aucun autre paquet n'en dépend"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Marquer ^manuel"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4463,11 +4467,11 @@
 "Marquer le paquet choisi comme ayant été manuellement installé ;\n"
 "il ne sera pas supprimé tant que vous ne le ferez pas vous-même"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Interdire version"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4476,205 +4480,205 @@
 "Interdire d'installer la version proposée pour le paquet sélectionné;\n"
 "les versions ultérieures du paquet seront normalement installées"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformation"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Afficher plus d'informations sur le paquet sélectionné"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "Liste des ^modifications"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Afficher la liste des modifications (« changelog ») du paquet sélectionné"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Rechercher"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Rechercher un paquet"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Rechercher ^encore"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Recommencer la recherche précédente"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "Affichage ^restreint"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Filtrer la liste des paquets"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "Affichage ^complet"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Supprimer le filtre de la liste des paquets"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Rechercher ^cassés"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Rechercher le prochain paquet avec des dépendances non satisfaites"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Options de l'Interface ^Utilisateur"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Modifier les paramètres qui affectent l'interface utilisateur"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Gestion des Dépendances"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Changer les paramètres qui régissent la gestion des dépendances"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Divers"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "^Modifier divers paramètres du programme"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Revenir aux valeurs précédentes des options"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Remettre tous les paramètres à leurs valeurs par défaut"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Suivant"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Affichage de l'écran suivant"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Précédent"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Affichage de l'écran précédant"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Fermer"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Fermer cet écran"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nouvelle ^Vue des Paquets"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Créer une nouvelle vue par défaut des paquets"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nouvelle vue par ^Catégories"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Parcourir les paquets par catégorie"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "A ^propos"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Afficher l'information à propos de ce programme"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Aide"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Afficher l'aide en ligne d'Aptitude"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Manuel Utilisateur"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Afficher le manuel d'utilisation détaillé"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Afficher la liste des questions souvent posées"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Afficher les changements importants de chaque version du programme"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Afficher les termes selon lesquels vous pouvez copier ce programme"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Actions"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Options"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Vues"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Aide"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4683,11 +4687,11 @@
 "%s : Menu  %s : Aide  %s : Quitter  %s : M-à-J  %s : Téléch./Inst./Suppr. "
 "Pqts"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "o"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "n"
 
@@ -4760,7 +4764,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ouille ! j'ai reçu un SIGQUIT, je termine...\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/gl.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/gl.po	(original)
+++ branches/aptitude-0.3/aptitude/po/gl.po	Wed Jul  6 22:10:50 2005
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.0.7.19\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2001-03-10 02:33+01:00\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at gpul.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -875,64 +875,68 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Paquetes para actualizar"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Paquetes para instalar"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "Non se puido abrir %s para rexistra-las accións"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Erro ao escribi-lo ficheiro de estado"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr ""
@@ -1244,7 +1248,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Non se puideron limpa-los directorios de listas"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -2129,7 +2133,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr ""
 
@@ -2337,7 +2341,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr ""
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paquete"
 
@@ -3644,510 +3648,510 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Versións"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "¿Realmente quere saír?"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Algúns paquetes están corrompidos. ¿Arranxalos? "
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
 "upgrade."
 msgstr ""
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Non se puido abrir %s para rexistra-las accións"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 #, fuzzy
 msgid "^Install/remove packages"
 msgstr "Paquetes Instalados"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 #, fuzzy
 msgid "^Update package list"
 msgstr "Actualizando as listas de paquetes"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 #, fuzzy
 msgid "^Forget new packages"
 msgstr "Paquetes Novos"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 #, fuzzy
 msgid "^Install"
 msgstr "instalar"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 #, fuzzy
 msgid "^Purge"
 msgstr "purgar"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 #, fuzzy
 msgid "^Hold"
 msgstr "reter"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
 msgstr ""
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 #, fuzzy
 msgid "^Forbid Version"
 msgstr "Versións"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
 msgstr ""
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 #, fuzzy
 msgid "I^nformation"
 msgstr "Información de %s"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 #, fuzzy
 msgid "Display more information about the selected package"
 msgstr "Información de %s"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 #, fuzzy
 msgid "^Changelog"
 msgstr "Rexistro de modificacións de "
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 #, fuzzy
 msgid "Apply a filter to the package list"
 msgstr "Actualizando as listas de paquetes"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 #, fuzzy
 msgid "Find ^Broken"
 msgstr "corrupto"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 #, fuzzy
 msgid "New Package ^View"
 msgstr "Paquetes Novos"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 #, fuzzy
 msgid "View information about this program"
 msgstr "Información de %s"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 #, fuzzy
 msgid "View the on-line help"
 msgstr "Axuda en liña de Aptitude"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 #, fuzzy
 msgid "Actions"
 msgstr "Acción"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 #, fuzzy
 msgid "Options"
 msgstr "Acción"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 #, fuzzy
 msgid "no_key"
 msgstr "nada"
@@ -4220,7 +4224,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr ""
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/it.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/it.po	(original)
+++ branches/aptitude-0.3/aptitude/po/it.po	Wed Jul  6 22:10:50 2005
@@ -42,7 +42,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.9\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-04-12 22:24+0200\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza at libero.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -970,66 +970,70 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "I seguenti pacchetti sono DIFETTOSI:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Impossibile aprire %s in scrittura"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Errore nella scrittura del file di stato"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Risposta non ammessa. Immettere un comando valido o «?» per l'aiuto.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Risposta non ammessa. Immettere un comando valido o «?» per l'aiuto.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: si deve specificare almeno un'espressione di ricerca\n"
@@ -1336,7 +1340,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Impossibile ripulire le directory dell'elenco"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Cancellazione dei vecchi file scaricati"
 
@@ -2275,7 +2279,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Campo minato"
 
@@ -2486,7 +2490,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pacchetto"
 
@@ -4118,44 +4122,44 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Versioni"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Continua comunque"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Annulla l'installazione"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Anteprima dell'installazione dei pacchetti"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Mostra e modifica le azioni da compiere"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^Precedente"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alcuni pacchetti erano difettosi e sono stati corretti"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Perdi tempo cercando di scovare le mine"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4164,24 +4168,24 @@
 "Per installare e rimuovere pacchetti servono i privilegi di amministratore,\n"
 "dei quali al momento si è privi. Passare all'account di root?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Diventa root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Non diventare root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Un aggiornamento dell'elenco dei pacchetti o un'installazione è già in corso."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Non ci sono pacchetti da installare, rimuovere o aggiornare."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4193,7 +4197,7 @@
 "Alcuni pacchetti potrebbero venire aggiornati ma si è scelto di non farlo.\n"
 "Premere «U» per preparare un aggiornamento."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4203,116 +4207,116 @@
 "amministratore,\n"
 "dei quali attualmente si è privi. Passare all'account di root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Perdi tempo cercando di scovare le mine"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Pulire mentre è in corso uno scaricamento non è permesso"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Cancellazione dei file scaricati"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "I file dei pacchetti scaricati sono stati cancellati"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "I file dei vecchi pacchetti scaricati sono stati cancellati"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Perdi tempo cercando di scovare le mine"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Impossibile aprire %s in scrittura"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Installa/rimuovi pacchetti"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Procede ad installare e rimuovere i pacchetti"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Aggiorna l'elenco dei pacchetti"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Cerca nuove versioni dei pacchetti"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Dimentica i nuovi pacchetti"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Dimentica quali pacchetti sono «nuovi»"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Pulisci la cache dei pacchetti"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Cancella i file dei pacchetti scaricati precedentemente"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "^Cancella i file vecchi"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Cancella i file dei pacchetti che non si possono più scaricare"
 
 # 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/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Aggiorna ^tutti i pacchetti"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Richiede l'aggiornamento di tutti i pacchetti aggiornabili non bloccati"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Gioca a campo minato"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Diventa ^root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4321,80 +4325,80 @@
 "Esegue «su» per diventare root; questo farà ripartire il programma,\n"
 "mantenendo però le impostazioni attuali"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "Ricarica ^la cache dei pacchetti"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Ricarica la cache dei pacchetti"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Esci"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Esce dal programma"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 "Annulla l'ultima operazione o gruppo di operazioni effettuate sui pacchetti"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Installa"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Richiede l'installazione e l'aggiornamento del pacchetto selezionato"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Rimuovi"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Richiede la rimozione del pacchetto selezionato"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Elimina"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Richiede la rimozione del pacchetto e dei suoi file di configurazione"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "Man^tieni"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Annulla ogni azione sul pacchetto selezionato"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Blocca"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "Annulla ogni azione sul pacchetto selezionato, impedendo aggiornamenti futuri"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Installato ^automaticamente"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4403,11 +4407,11 @@
 "Segna il pacchetto selezionato come installato automaticamente;\n"
 "verrà rimosso automaticamente se nessun altro pacchetto dipende da esso"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Installato ^manualmente"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4416,11 +4420,11 @@
 "Segna il pacchetto selezionato come installato manualmente;\n"
 "non verrà rimosso, a meno che non si intervenga manualmente"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Proibisci versione"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4430,208 +4434,208 @@
 "selezionato;\n"
 "le versioni successive verranno installate normalmente"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformazioni"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Mostra informazioni dettagliate sul pacchetto selezionato"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostra il changelog Debian del pacchetto selezionato"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Trova"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Cerca un pacchetto"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Trova ^successivo"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Ripete l'ultima ricerca"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Applica filtro"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Applica un filtro all'elenco dei pacchetti"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Rimuovi filtro"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Rimuove il filtro dall'elenco dei pacchetti"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Trova ^difettosi"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Trova il prossimo pacchetto con dipendenze non soddisfatte"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Opzioni dell'interfaccia ^utente"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Cambia le impostazioni che riguardano l'interfaccia utente"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Gestione delle ^dipendenze"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Cambia le impostazioni riguardo alla gestione delle dipendenze tra i "
 "pacchetti"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Varie"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Cambia altre impostazioni del programma"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Reimposta le opzioni"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Riporta tutte le impostazioni ai valori predefiniti"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Successivo"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Mostra la vista successiva"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Precedente"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Mostra la vista precedente"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Chiudi"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Chiude questa vista"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nuova ^vista dei pacchetti"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Crea una nuova vista dei pacchetti"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nuova vista per ^categorie"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Sfoglia i pacchetti per categoria"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Informazioni su"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Mostra le informazioni su questo programma"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Aiuto"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Mostra una breve guida online"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Manuale dell'utente"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Mostra il manuale dettagliato del programma"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Visualizza un elenco delle domande più frequenti"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr ""
 "Mostra i cambiamenti più importanti effettuati in ogni versione del programma"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licenza"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr ""
 "Mostra le condizioni in base alle quali è permessa la copia del programma"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Azioni"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Viste"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4640,12 +4644,12 @@
 "%s: menu  %s: Aiuto  %s: Esci  %s: Aggiorna  %s: Scarica/Installa/Rimuovi"
 
 # Put the appropriate key for Y/N choices here (lower case)
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "s"
 
 # Put the appropriate key for Y/N choices here (lower case)
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "n"
 
@@ -4716,7 +4720,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ricevuto il segnale SIGQUIT. Uscita immediata.\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/ja.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ja.po	(original)
+++ branches/aptitude-0.3/aptitude/po/ja.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.6-1\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2004-09-20 11:01+0900\n"
 "Last-Translator: YasuoEto <yasuo at etou.org>\n"
 "Language-Team: \n"
@@ -928,68 +928,72 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "以下のパッケージには解決できない依存関係があります:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "以下のパッケージが壊れています:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "%s を書き込み可能な状態で開けません"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "ステータスファイルの書き込みの際にエラーが起きました"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "不正な応答。正しいコマンドを入力するか '?' でヘルプを参照してください。\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "不正な応答。正しいコマンドを入力するか '?' でヘルプを参照してください。\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: 少なくとも一つの検索語が必要です\n"
@@ -1289,7 +1293,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "入手先一覧のディレクトリを綺麗にできませんでした"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "ダウンロードされた古いファイルを削除しています"
 
@@ -2196,7 +2200,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "マインスイーパ"
 
@@ -2405,7 +2409,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "パッケージ"
 
@@ -3998,45 +4002,45 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "バージョン"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "続行"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "導入するパッケージのプレビュー"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "実行されるアクションの表示や設定を行なう"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "前"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "一部のパッケージが壊れています。修復しました"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "地雷探しに挑戦して時間つぶし"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4045,23 +4049,23 @@
 "パッケージのインストールもしくは削除を行うには管理者権限が必要です。 \n"
 "現在権限がありません。rootになりますか? \n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "root になる"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "root にならない"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "現在パッケージリストのアップデート、またはインストールを実行中です。"
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "導入、削除、更新をする予定のパッケージがありません。"
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4073,7 +4077,7 @@
 "幾つかのパッケージは更新可能かもしれませんが、更新を選択されていません。\n"
 "\"U\"と打って更新の準備をしてください。"
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4082,112 +4086,112 @@
 "パッケージリストの更新には管理者権限が必要です。 \n"
 "現在権限がありません。root になりますか? \n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "地雷探しに挑戦して時間つぶし"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "ダウンロード中の削除は許可されていません"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "ダウンロードされたファイルを削除しています"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "ダウンロードされたパッケージファイルは既に削除されています"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "ダウンロードされた古いパッケージのファイルは削除されました"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "地雷探しに挑戦して時間つぶし"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "%s を書き込み可能な状態で開けません"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "パッケージのインストールまたは削除"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "選択されているパッケージの導入や削除"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "パッケージのリストを更新する"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "パッケージの新しいバージョンを確認する"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "新規パッケージ一覧を消去"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "どのパッケージが \"新規\"かを消去"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "パッケージのキャッシュを消去"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "ダウンロードされたパッケージのファイルを削除する"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "使われていないファイルを消す"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "もうダウンロードできないパッケージのファイルを削除する"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "更新可能なものをマークする"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "更新用にマークされていない更新可能なパッケージをすべてマークする"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "マインスイーパで遊ぶ"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "root になる"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4196,79 +4200,79 @@
 "su を実行して root になり、プログラムを再起動します。\n"
 "その際、現在の設定は保持されます。"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "パッケージキャッシュの再読み込み"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "パッケージのキャッシュを再度読み込む"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "終了"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "プログラムの終了"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "戻る"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "最後に行なったパッケージ管理操作を戻す"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "インストール"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "インストールかアップグレードするよう選択されたパッケージ"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "削除"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "削除されるよう選択されたパッケージ"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "完全削除"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "パッケージ及び設定ファイルを削除するよう選択されたパッケージ"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "保持"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "選択されたパッケージはアクションが取り消される"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "維持"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "選択されたパッケージはアクションが取り消され、今後もアップグレードも 防がれる"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "自動マーク"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4277,11 +4281,11 @@
 "選択されたパッケージに自動でインストールされた印を付ける;\n"
 "依存していたパッケージがなくなるとと自動的削除されるだろう"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "手動マーク"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4290,11 +4294,11 @@
 "選択されたパッケージに手動でインストールされた印を付ける;\n"
 "手動で削除されない限り削除されないだろう"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "禁止バージョン"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4303,204 +4307,204 @@
 "選択されたパッケージの候補バージョンがインストールされるのを禁止する;\n"
 "通常インストールされているものより新しいバージョンのパッケージです"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "情報"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "選択されたパッケージのより詳しい情報が表示される"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "変更履歴"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "選択されたパッケージの更新履歴が表示される"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "検索"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "パッケージを検索する"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "再検索"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "最後に行なった検索を繰り換えす"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "表示制限"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "パッケージリストをフィルタリングする"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "表示制限解除"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "パッケージリストのフィルターを削除する"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "壊れているものを探す"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "解決できない依存関係があるパッケージを探す"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "UIオプション"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "ユーザインターフェースに影響する設定を変更する。"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "依存関係の処理"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "パッケージ依存関係の処理に関する設定を変更"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "その他"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "その他の設定の変更"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "オプションを元に戻す"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "すべての設定をデフォルトの設定に戻す"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "次"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "次の画面を表示"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "前"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "前の画面を表示"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "閉じる"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "この画面を閉じる"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "新しいパッケージ画面"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "新規に標準のパッケージ画面を作成"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "新しいカテゴリーで表示"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "パッケージを詳しく分類して表示します。"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "このプログラムについて"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "このプログラムについての説明"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "ヘルプ"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "オンラインヘルプを表示します"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "ユーザマニュアル"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "詳細なマニュアルを表示します"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "頻繁に質問される事を表示します"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "プログラムの重要なバージョンごとの変更点を表示します"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "ライセンス"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "プログラムを再配布する際などの条件を表示"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "アクション"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "検索"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "オプション"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "表示"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4508,11 +4512,11 @@
 msgstr ""
 "%s: メニュー  %s: ヘルプ  %s: 終了  %s: 更新  %s: パッケージの 取得/導入/削除"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "yes keu"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "no key"
 
@@ -4583,7 +4587,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "あが! SIGQUITを受けました、死亡…\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/lt.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/lt.po	(original)
+++ branches/aptitude-0.3/aptitude/po/lt.po	Wed Jul  6 22:10:50 2005
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-17 07:26+0300\n"
 "Last-Translator: Darius Žitkevičius <skystis at splius.lt>\n"
 "Language-Team:  <komp_lt at konferencijos.lt>\n"
@@ -919,62 +919,66 @@
 "as necessary."
 msgstr "Derinimas dabartinį sprendimą atmes ir jei būtina pakeis."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Šie veiksmai išspręs priklausomybes:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Priimti šį sprendimą? [Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Atmetami visi bandymai išspręsti priklausomybes."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Galimos Å¡ios komandos:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Byla į kurią įrašyti būseną: "
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Negaliu atidaryti %s rašymui"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Klaida rašant būsenos bylą %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Blogas atsakymas; įveskite vieną iš išvardintų komandų:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "Per nurodytÄ… laikÄ… sprendimas nerastas.  Pasistengti labiau? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Blogas atsakymas; įveskite „y“ arba „n“."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Nepavyksta išspręsti priklausomybių!  Pasiduodu..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Sprendimų nebėra."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "paieška: Jūs turite įvesti bent vieną paieškos žodį\n"
@@ -1278,7 +1282,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Negaliu išvalyti aplankų sąrašo"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Trinamos pasenusios gautos bylos"
 
@@ -2194,7 +2198,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "DÄ—mesio: vizualus interfeisas ignoruos -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Minų laukas"
 
@@ -2403,7 +2407,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paketas"
 
@@ -3968,35 +3972,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versija %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Tikrai tęsti"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Atšaukti diegimą"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Peržiūrėti paketo diegimą"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Žiūrėti ir/arba keisti veiksmus, kurie bus vykdomi"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Peržiūra"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Kai kurie paketai buvo sugadinti ir buvo sutvarkyti:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Šioms priklausomybių problemoms sprendimo nėra!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4005,7 +4009,7 @@
 "Bandant sutvarkyti priklausomybes baigÄ—si tam skirtas laikas (spauskite %s, "
 "kad labiau pasistengti)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4013,23 +4017,23 @@
 "Norėdami įdiegti/pašalinti paketus turite turėti administratoriaus (root) "
 "privilegijas, kurių jūs neturite.  Ar norite pereiti į „root“ paskyrą?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Tapti „root“"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Netapti „root“"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Paketų atnaujinimas arba diegimas jau vyksta."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Jokio paketo įdiegimas, pašalinimas ar atnaujinimas neplanuojamas."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4039,7 +4043,7 @@
 "būtų galima atnaujinti, tačiau jūs nenurodėte juos atnaujinti. Spauskite „U“ "
 "kad paruošti atnaujinimą."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4047,112 +4051,112 @@
 "Norint atnaujinti paketų sąrašą reikalingos administratoriaus privilegijos, "
 "kurių jūs šiuo metu neturite. Ar norite pereiti į root paskyrą?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Gaištate laiką bandydami rasti minas"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Valymas tuo metu, kai gaunami paketai, draudžiamas"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Trinu gautas bylas"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Gautos paketų bylos ištrintos"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Pasenę gauti paketai ištrinti, atlaisvinta %sB."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Sprendimai išseko."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Ieškant sprendimo baigėsi tam skirtas laikas."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Nepavyko rasti sprendimo."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Nepavyko atidaryti %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Klaida įrašant būseną"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Byla į kurią įrašyti būseną:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Diegti/Å¡alinti paketus"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Vykdyti numatytus veiksmus"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Atnaujinti paketų sąrašą"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Ieškoti naujų paketų versijų"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Pamiršti naujus paketus"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Pamiršti kurie paketai yra „nauji“"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Valyti paketų krepšį"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Ištrinti paketus, kurie buvo atsiųsti anksčiau"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "^IÅ¡valyti pasenusius paketus"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Pašalinti paketus, kurių nebeįmanoma gauti"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Pažymėti ^kaip atnaujinamą"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Pažymėti visus atnaujinamus paketus, kurie nesulaikomi nuo atnaujinimo."
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "Žaisti ^Minų lauką"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Tapti „root“"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4160,68 +4164,68 @@
 "Paleiskite komandą „su“, kad taptumėte root;  Programa startuos iš naujo, "
 "bet visi jūsų nustatymai išliks."
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Perdaryti paketų krepšį"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Perkrauti paketų krepšį"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Baigti"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Išeiti iš programos"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Atšaukti"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Atšaukti paskutinį veiksmą, arba operacijų grupę."
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "Įd^iegti"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Pažymėti dabartinį paketą diegti arba atnaujinti"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Pašalinti"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Pažymėti šį paketą, kaip šalinamą"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "iš^naikinti"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Pažymėti šį paketą ir jo konfigūracinius failus, kaip šalinamus"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Palikti"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Atšaukti šiam paketui visus veiksmus"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Sulaikyti"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4229,11 +4233,11 @@
 "Atšaukti šiam paketui visus veiksmus, ir apsaugoti jį nuo ateities "
 "atnaujinimų"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Pažymėti ^Auto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4241,11 +4245,11 @@
 "Pažymėti parinktus paketus kaip įdiegtus automatiškai; tuomet jie bus "
 "automatiškai pašalinti, kai jų nebereikės kitiems paketams"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Žymėti ^Ne automatinis"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4253,11 +4257,11 @@
 "Pažymėti pasirinktus paketus, kaip įdiegtus rankiniu būdu; jie nebus "
 "pašalinti tol, kol to nepadarysite rankiniu būdu"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Uždrausti Versiją"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4265,205 +4269,205 @@
 "Uždrausti pažymėto paketo siūlomą versiją; naujesnės paketo versijos bus "
 "įdiegtos kaip įprasta"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformacija"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Parodyti daugiau informacijos apie pažymėtą paketą"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "Pakeitimų ^sąrašas"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Rodyti šio paketo Debian pakeitimų sąrašą (changelog)"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Rasti"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Ieškoti paketo"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Rasti ^VÄ—l"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Pakartoti paskutinę paiešką"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Apriboti ekranÄ…"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Pritaikyti filtrą paketų sąrašui"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Neriboti ekrano"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Nebenaudoti paketų sąrašo filtro"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Rasti ^BlogÄ…"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Rasti sekantį blogą paketą"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^Aplinkos parinktys"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Pakeisti nustatymus, susijusius su naudotojo aplinka"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Priklausomybių tvarkymas"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Keisti nustatymus, kurie turi įtakos darbui su paketų priklausomybėmis"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Kitkas"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Keisti kitus programos nustatymus"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "Atstatyti ^parinktis"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Atstatyti sistemos pradinius nustatymus"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Sekantis"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Pereiti į sekantį ekraną"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Atgal"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Pereiti į ankstesnį ekraną"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Uždaryti"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Uždaryti šį ekraną"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Sekantis paketų ^vaizdas"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Sukurti naują standartinį paketų rodymą"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "^Nauja kategorijų naršyklė"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Naršyti paketus pagal kategorijas"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Apie"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Rodyti informacijÄ… apie Å¡iÄ… programÄ…"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Pagalba"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Rodyti pagalbÄ…"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "Naudotojo ^instrukcijos"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Rodyti detalizuotas naudotojo instrukcijas"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^DUK"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Rodyti dažniausiai užduodamų klausimų sąrašą"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^NAUJIENOS"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr ""
 "Rodyti svarbiausius pakeitimus, kurie atsirado kiekvienoje versijoje "
 "programos "
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licencija"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Rodyti sÄ…lygas, pagal kurias JÅ«s galite kopijuoti Å¡iÄ… programÄ…"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Veiksmai"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Paieška"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Parinktys"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Rodymas"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Pagalba"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4471,11 +4475,11 @@
 msgstr ""
 "%s: Meniu  %s: Pagalba  %s: Baigti  %s: Atnaujinti  %s: Pritaikyti pakeitimus"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "t"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "n"
 
@@ -4545,7 +4549,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Oi!  Gavau SIGQUIT, mirštu...\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/nb.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/nb.po	(original)
+++ branches/aptitude-0.3/aptitude/po/nb.po	Wed Jul  6 22:10:50 2005
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-13 21:20+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -927,62 +927,66 @@
 "Justeringer gjør at nåværende løsning forkastes og regnes om på nytt om "
 "nødvendig."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Følgende handlinger vil løse opp disse avhengighetene:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Godta denne løsningen? [Y/n/q/?]"
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Gir opp alle forsøk på å løse opp disse avhengighetene."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Følgende kommandoer er tilgjengelige:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Fil som løsningsstatus skal skrives til: "
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Klarer ikke å åpne %s for å skrive til den"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Feil under skriving av tilstand til %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ugyldig respons. Skriv inn en av følgende kommandoer:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "INgen løsning funnet innen tidsfristen. Arbeide videre? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ugyldig respons. Skriv inn 'y' eller 'n'."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Klarer ikke løse opp avhengigheter! Gir opp ..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Ingen flere løsninger."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "søk: Du må oppgi minst ett søkeord\n"
@@ -1282,7 +1286,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Klarte ikke å slette listemappene"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter nedlastede filer som er foreldet"
 
@@ -2185,7 +2189,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Advarsel: det grafiske grensesnittet ignorerer -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Minesveiper"
 
@@ -2395,7 +2399,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pakke"
 
@@ -3987,35 +3991,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versjon %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Er du sikker på at du vil fortsette?"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Avbryt installasjonen"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Forhåndsvisning av pakkeinstallasjonen"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Vis og/eller juster handlingene som vil bli utført"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Noen pakker var skadet og har blitt reparert:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Det finnes ingen løsning på disse avhengighetsproblemene!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4024,7 +4028,7 @@
 "Slapp opp for tid under forsøk på å løse opp avhengigheter (trykk «%s» for å "
 "arbeide videre)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4032,24 +4036,24 @@
 "Ã… installere eller fjerne pakker krever at du er logget inn som root, noe du "
 "ikke er. Vil du logge deg inn som root nå?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Ikke bli root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Det foregår allerede en oppdatering av pakkelistene eller en installasjon."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil bli installert, oppgradert eller fjernet."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4059,7 +4063,7 @@
 "oppgraderes, men du har ikke valgt at de skulle oppgraderes. Tast «U» for å "
 "forberede oppgradering."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4067,23 +4071,23 @@
 "Ã… oppdatere pakkelistene krever at du er logget inn som root, noe du ikke "
 "er. Vil du logge deg inn som root nå?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Kast bort tid på å finne miner"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Du kan ikke slette nedlastede filer mens nedlasting foregår"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Sletter nedlastede filer"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Nedlastede filer er slettet"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -4092,88 +4096,88 @@
 "Foreldede, nedlastede pakkefiler er blitt slettet, det frigjorde %sB "
 "diskplass."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Alle løsninger utprøvet."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Tidsgrensen utløp under forsøk på å finne en løsning."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Klarer ikke finne en løsning som skal brukes."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Klarer ikke å åpne %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Feil under dumping av løsermotorens tilstand"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Fil som løsermotorens tilstand skal dumpes til:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^installer/slett pakker"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Utfør alle ventende installeringer og slettinger"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Oppdater pakkelista"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Se etter nye versjoner av pakkene"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Glem nye pakker"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker som er «nye»"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Slett mellomlageret for pakker"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Slett alle pakkefiler som ble lastet ned tidligere"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Fjern ^foreldede filer"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slett pakkefiler som ikke lenger kan lastes ned"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Marker ^oppgraderbare"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle oppgraderbare pakker som ikke holdes tilbake"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Spill minesveiper"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Bli root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4181,68 +4185,68 @@
 "Kjør «su» for å bli root.  Dette vil starte programmet på nytt, men "
 "innstillingene blir bevart"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Last pakkelageret på nytt"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Last mellomlageret for pakker på nytt"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Avslutt"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Angre"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Angre den siste pakkeoperasjonen eller en gruppe operasjoner"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merk den valgte pakken for installasjon eller oppgradering"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Fjern"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Merk den valgte pakken for fjerning"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Slett helt"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Merk den valgte pakken og dens oppsettsfiler for fjerning"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Opphev alle handlinger med den valgte pakken"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Hold"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4250,11 +4254,11 @@
 "Opphev alle handlinger med den valgte pakken og beskytt den mot senere "
 "oppgradering"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Merk ^Auto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4262,11 +4266,11 @@
 "Merk den valgte pakka som automatisk installert, den blir automatisk fjernet "
 "hvis ingen andre pakker avhenger av den"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Merk ^Manuell"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4274,11 +4278,11 @@
 "Merk den valgte pakka som manuelt installert, den blir ikke fjernet hvis du "
 "ikke fjerner den manuelt"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Forby versjon"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4286,204 +4290,204 @@
 "Forby installasjon av kandidatversjonen av den valgte pakka, nyere versjoner "
 "av pakka vil bli installert som vanlig"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformasjon"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Vis mer informasjon om den valgte pakka"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Endringslogg"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians endringslogg for den valgte pakka"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Finn"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Søk etter en pakke"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Finn ^igjen"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Gjenta siste søk"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "Be^grens visning"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Bruk et filter på pakkelista"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Ubegrenset visning"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Fjern filtrering av pakkelista"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Finn ^Ødelagt"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Finn neste pakke med utilfredsstilte avhengigheter"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^Innstillinger av grensesnittet"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Gjør om på innstillingene som berører grensesnittet"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^HÃ¥ndtering av avhengigheter"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Gjør om på innstillingene som berører hvordan pakkeavhengigheter behandles"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Annet"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Gjør endringer i andre programinnstillinger"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Slett valgene"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Gjenopprett standardinnstillingene"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Neste"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Vis neste skjermbilde"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Forh"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Vis forrige skjermbilde"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Lukk"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Lukk dette skjermbildet"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Ny pakke^visning"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Lag en ny pakkevisning"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Ny visning etter ^kategori"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Vis pakker etter pakketype"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Vis informasjon om dette programmet"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Hjelp"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Vis hjelpen"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "Bruker^håndbok"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Vis en detaljert brukerhåndbok"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^OSS"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over Ofte Spurte Spørsmål"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^NYHETER"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Vis hvilke viktige endringer som er blitt gjort i hver ny versjon av"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Lisens"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Vis under hvilke betingelser du kan kopiere dette programmet"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Søk"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Valg"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Visninger"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4492,11 +4496,11 @@
 "%s: Meny  %s: Hjelp  %s: avslutt  %s: Oppdater  %s: Last ned/installer/slett "
 "pakker"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "ja_tast"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "nei_tast"
 
@@ -4566,7 +4570,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au!  Fikk signalet SIGQUIT, avslutter ... \n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/nl.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/nl.po	(original)
+++ branches/aptitude-0.3/aptitude/po/nl.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.9-1\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-22 15:19+0200\n"
 "Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -949,62 +949,66 @@
 "Aanpassingen zullen de huidige oplossing doen vergeten en opnieuw berekenen "
 "indien nodig."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "De volgende acties zullen deze afhankelijkheden oplossen:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Deze oplossing aanvaarden? [Y/n/q/?]"
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Alle pogingen staken om deze afhankelijkheden op te lossen."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "De volgende commando's zijn beschikbaar:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Bestand om de resolver-toestand in weg te schrijven:"
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Kan %s niet openen om te schrijven"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Fout bij het schrijven van de resolver-toestand naar %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ongeldig antwoord; geef één van de volgende commando's:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "Geen oplossing gevonden in de toegewezen tijd. Harder proberen? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ongeldig antwoord; geef 'y' of 'n' in."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Niet gelukt om de afhankelijkheden op te lossen! Gestopt..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Geen oplossingen meer."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "opzoeking: U moet minstens één zoekterm opgeven\n"
@@ -1304,7 +1308,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Kon lijstmappen niet opkuisen"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Verwijderen van verouderde, opgehaalde bestanden"
 
@@ -2234,7 +2238,7 @@
 msgstr ""
 "Waarschuwing: de grafische interface zal -s/Cmdline::Simulate negeren\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Mijnenveger"
 
@@ -2445,7 +2449,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pakket"
 
@@ -4039,35 +4043,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versie %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Werkelijk verdergaan"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Breek installatie af"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Preview van de pakketinstallatie."
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Bekijk en/of wijzig de acties die zullen worden uitgevoerd"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Vooruitblik"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Enkele pakketten zijn beschadigd en zijn gerepareerd:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Er bestaat geen oplossing voor deze afhankelijkheidsproblemen!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4076,7 +4080,7 @@
 "Tijd verloren bij het proberen van afhankelijkheden op te lossen (druk \"%s"
 "\" om harder te proberen)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4084,27 +4088,27 @@
 "Installeren/verwijderen van pakketten vereist administratieve privileges, "
 "die u momenteel niet heeft. Wenst u te wijzigen naar de root-account?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Word root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Word geen root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Een bijwerking van de pakketlijst of een installatieloop is reeds aan de "
 "gang."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Er zijn geen pakketten gepland voor installatie, opwaardering of "
 "verwijdering."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4114,7 +4118,7 @@
 "Enkele pakketten kunnen worden opgewaardeerd, maar u hebt niet gekozen om ze "
 "op te waarderen. Typ \"U\" om een opwaardering voor te bereiden."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4122,23 +4126,23 @@
 "Bijwerken van pakketlijsten vereist administratieve privileges, die u "
 "momenteel niet heeft. Wenst u te wijzigen naar de root-account?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Tijd verliezen bij het proberen vinden van mijnen"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Opkuisen terwijl een ophaling aan de gang is, is niet toegelaten."
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Opgehaalde bestanden verwijderen"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Opgehaalde pakketbestanden zijn verwijderd"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -4147,90 +4151,90 @@
 "Verouderde opgehaalde pakketbestanden zijn verwijderd, %sB schijfruimte "
 "wordt vrijgemaakt."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Alle oplossing uitgeput."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Teveel tijd nodig om een oplossing te vinden."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Niet mogelijk om een oplossing te vinden om toe te passen."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Kan %s niet openen"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Fout bij het archiveren van de resolver-toestand"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Bestand waarin de resolver-toestand moet worden gearchiveerd:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Installeer/verwijder pakketten"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Doe alle uitstaande installaties en verwijderingen"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Werk pakketlijst bij"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Controleer op nieuwe versies van pakketten"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Vergeet nieuwe pakketten"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Vergeet welke pakketten \"nieuw\" zijn"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Kuis de ^pakketcache"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Verwijder pakketbestanden die vroeger opgehaald zijn"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "^Kuis de veroudere bestanden uit"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Verwijder pakketbestanden die niet langer kunnen opgehaald worden"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "^Markeer opwaardeerbaar"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Markeer alle opwaardeerbare pakketten die niet behouden zijn voor "
 "opwaardering"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Speel Mijnenveger"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Word ^root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4238,71 +4242,71 @@
 "Voer 'su' uit om root te worden; dit zal het programma herstarten, maar uw "
 "instellingen zullen bewaard blijven."
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Herlaad pakketcache"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Herlaad de pakketcache"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Afsluiten"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Sluit het programma af"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Maak de laatste pakketoperatie of groep van operaties ongedaan."
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Installeren"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Duid het momenteel geselecteerde pakket aan voor installatie of opwaardering"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Verwijderen"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Duid het momenteel geselecteerde pakket aan voor verwijdering"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Wissen (purge)"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Duid het momenteel geselecteerde pakket en zijn configuratiebestanden aan "
 "voor verwijdering"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "Be^houden"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Annuleer alle acties voor het geselecteerde pakket"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Bevriezen"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4310,11 +4314,11 @@
 "Annuleer alle acties voor het geselecteerde pakket en bescherm het voor "
 "toekomstige opwaarderingen"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Markeer ^automatisch"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4322,11 +4326,11 @@
 "Markeer het geselecteerde pakket als automatisch geïnstalleerd; het zal "
 "automatisch worden verwijderd als er geen pakketten meer op steunen"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "^Markeer handmatig"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4334,11 +4338,11 @@
 "Markeer het geselecteerde pakket als handmatig geïnstalleerd; het zal niet "
 "worden verwijderd tenzij u het handmatig verwijdert"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "V^erboden versie"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4347,205 +4351,205 @@
 "nieuwere versies van het pakket zullen zoals gebruikelijk worden "
 "geïnstalleerd"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformatie"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Toon meer informatie over het geselecteerde pakket"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Toon de Debian-changelog van het geselecteerde pakket"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Zoek"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Zoek naar een pakket"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Zoek ^Opnieuw"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Herhaal de laatste zoekopdracht"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Beperk Weergave"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Pas een filter toe op de pakketlijst"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Hef Beperking Weergave Op"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Verwijder de filter van de pakketlijst"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Zo^ek Beschadigde"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Zoek het volgende pakket met niet-voldane afhankelijkheden"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^UI-opties"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Wijzig de instellingen die de gebruikersinterface aangaan"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Afhankelijkheidsafhandeling"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Wijzig de instellingen die bepalen hoe pakketafhankelijkheden worden "
 "behandeld"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "A^llerlei"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Wijzig allerlei programma-instellingen"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Inverteer opties"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Zet alle instellingen op de systeemstandaard"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Volgende"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Bekijk volgende weergave"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "V^orige"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Bekijk vorige weergave"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Sluiten"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Sluit deze weergave"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nieuwe ^Pakket-View"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Maak een nieuwe standaard pakketview"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nieuwe ^Categorische Bladeraar"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Doorblader pakketten per categorie"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Over"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Bekijk informatie over dit programma"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Help"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Bekijk de online help"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Gebruikershandleiding"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Bekijk de gedetailleerde programmahandleiding"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Bekijk een lijst van veel gestelde vragen"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^Nieuws"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Bekijk de belangrijke gemaakte wijzigingen in elke versie van"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licentie"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Bekijk de voorwaarden waaronder u het programma mag kopiëren"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Acties"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Zoek"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opties"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Views"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Help"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4554,11 +4558,11 @@
 "%s: Menu  %s: Help  %s: Afsluiten  %s: Bijwerken  %s: Ophalen/Inst./Verw. "
 "Pakketten"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "ja-toets"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "nee-toets"
 
@@ -4628,7 +4632,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Kuch! Kreeg SIGQUIT, stervend..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/nn.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/nn.po	(original)
+++ branches/aptitude-0.3/aptitude/po/nn.po	Wed Jul  6 22:10:50 2005
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_nn\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-27 21:26+0200\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll at skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -931,63 +931,67 @@
 "Endringar fil føre til at den noverande løysinga vil bli forkasta og ei ny "
 "løysing vil bli funne."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Desse handlingane vil løyse desse pakkekrava:"
 
 # Hugs [J]a, [n]ei, [a]vslutt
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Vil du godta denne løysinga? [J/n/a/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Avbryt alt arbeid med å løyse desse pakkekrava."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Desse kommandoane er tilgjengelege:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Fil for å skrive løysingstilstanden i: "
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Klarer ikkje opna %s for å skriva til ho"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Feil ved skriving av løysingstilstand til %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ugyldig respons. Skriv inn ein av dei følgjande kommandoane:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "Inga løysing funne innanfor den tildelte tida. Prøve hardare? [J/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ugyldig respons. Skriv «j» eller «n»."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Klarer ikkje løyse pakkekrava! Gjev opp ..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Ingen fleire løysingar."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "søk: Du må oppgje iallefall eitt søkje ord\n"
@@ -1287,7 +1291,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Klarte ikkje reinska ut listekatalogane"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Slettar nedlasta filer som er forelda"
 
@@ -2199,7 +2203,7 @@
 msgstr ""
 "Ã…tvaring: det visuelle grensesnittet vil ignorere -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Minesveiper"
 
@@ -2409,7 +2413,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pakke"
 
@@ -3988,35 +3992,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versjon %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Vil du verkeleg halda fram"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Avbryt Installasjon"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Førehandsvising av pakkeinstallasjon"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Vis og/eller endra på handlingane som skal utførast"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Førehandsvising"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Nokre pakkar var øydelagde og har blitt fiksa:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Inga løysing på desse pakkekrava finst!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4024,7 +4028,7 @@
 msgstr ""
 "Har brukt opp tida på å løyse pakkekrav (trykk «%s» for å prøve hardare)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4032,23 +4036,23 @@
 "Ã… installera/fjerna pakkar krev at du har administrative rettar, noko du "
 "ikkje har no. Vil du byte til root-kontoen?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Ikkje bli root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Ei oppdatering av pakkelista eller ei installering er allereie igang."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakkar vil bli installert, oppgradert eller fjerna."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4058,7 +4062,7 @@
 "oppgraderast, men du har ikkje valt at dei skulle oppgraderast. Tast «U» for "
 "å førebu oppgradering."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4066,23 +4070,23 @@
 "Oppdatering av pakkelister krev administrative rettar, noko du ikkje har no. "
 "Vil du byte til root-kontoen?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Bruke tida på å finna miner"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Å vaske medan ei nedlasting held på er ikkje tillatt!"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Slettar nedlasta filer"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Nedlasta pakkefiler er blitt sletta"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -4091,88 +4095,88 @@
 "Forelda nedlasta pakkefiler er blitt sletta og har frigjort %sB med "
 "diskplass."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Alle løysingar er oppbrukt."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Brukte opp tida på å finne ei løysing."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Klarer ikkje å finne ei løysing som kan brukast."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Klarer ikkje opna %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Feil ved lagring av løysingstilstanden"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Fila der løysingstilstanden skal lagrast:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Installer/fjern pakkar"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Utfør installering og fjerning av pakkar"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Oppdater pakkeliste"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Sjå etter nye versjonar av pakkar"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Gløym nye pakkar"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Gløym kva for pakkar som er «nye»"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Reinsk pakkemellomlageret"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Slett tidlegare nedlasta pakkefiler"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Slett ^forelda filer"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slett pakkefiler som ikkje kan hentast lenger"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Marker ^Oppgraderbare"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle pakkar som ikkje er haldt tilbake til oppgradering"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Spel minesveipar"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Bli ^root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4180,68 +4184,68 @@
 "Køyrer «su» for å bli root. Dette vil starta programmet på ny, men "
 "instillingane vil bli tatt vare på."
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Last inn igjen pakkemellomlageret"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Lastar pakkelagert inn på ny"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Avslutt"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Avsluttar programmet"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Angra"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Angrar den siste pakkehandlinga eller gruppe av handlingar"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merkjer den valde pakke for installasjon eller oppgradering"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Fjern"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Merkjer den valde pakke for fjerning"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Reinsk ut"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Merkjer den valde pakken for fjerning av programfiler og oppsettsfiler"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Ta vare på"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Avbryt handlingane på den valde pakken"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Hald tilbake"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4249,11 +4253,11 @@
 "Avbryt handlinar på den valde pakken og vernar han mot framtidige "
 "oppgraderingar."
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Merk ^Auto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4261,11 +4265,11 @@
 "Merk den valde pakken som om han er automatisk installert. Pakken vil "
 "automatisk bli fjerna viss ingen andre pakkar treng han."
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Merk ^Manuell"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4273,11 +4277,11 @@
 "Merk den valde pakken som om han var manuelt installert. Pakken vil ikkje "
 "bli fjerna viss du ikkje fjernar han manuelt."
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Forby versjon"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4285,203 +4289,203 @@
 "Forby denne versjonen av den valde pakken frå å bli installert.\n"
 "Nyare versjonar av pakken vil bli installert som vanleg"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformasjon"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Vis meir informasjon om den valde pakken"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Endringslogg"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis debianendringsloggen til den valde pakken"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Finn"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Søk etter ein pakke"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Finn i^gjen"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Gjer opp igjen det siste søket"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Filtrer vising"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Bruk eit filter på pakkelista"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Avfiltrer vising"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Fjernar filteret frå pakkelista"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Finn ^Øydelagd"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Finn den neste pakken med pakkekrav som ikkje er tilfredsstilt"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^Brukargrensesnitt"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Endrar innstillingane for brukargrenseflata"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Handsaming av pakkekrav"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Endra innstillingar som påverkar handtering av pakkekrav"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Ymse"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Endra ymse programinnstillingar"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Tilbakestill innstillingar"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Stiller tilbake alle innstillingar til standardverdiar"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Neste"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Vis neste skjermbilete"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Førre"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Vis førre skjermbilete"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Lukk"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Lukk dette skjermbilete"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Ny pakke^vising"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Lag ei ny standard for pakkevising"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Ny ^katagorivising"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Bla i pakkar etter kategori"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Vis informasjon om dette programmet"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Hjelp"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Vis hjelp"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Brukarvegleiing"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Vis den detaljerte programmanualen"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^SOS"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Vis ei liste over spørsmål og svar"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^NYHENDE"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Vis dei viktige endringane som er gjort i kvar versjon av "
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Lisens"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Vis vilkåra for å kopiera programmet"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Handlingar"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Søk"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Val"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Visingar"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4490,11 +4494,11 @@
 "%s: Meny  %s: Hjelp  %s: Avslutt  %s:Oppdater  %s: Lasta ned/Installer/"
 "Fjerna pakkar"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "n"
 
@@ -4564,7 +4568,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Oops!  Fekk SIGQUIT, dør..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/pl.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/pl.po	(original)
+++ branches/aptitude-0.3/aptitude/po/pl.po	Wed Jul  6 22:10:50 2005
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.3.2\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-22 15:19+0200\n"
 "Last-Translator: Micha³ Politowski <l10n at mp.pl.eu.org>\n"
 "Language-Team: Polish\n"
@@ -918,63 +918,67 @@
 "Wprowadzenie zmian spowoduje odrzucenie i ponowne przeliczenie bie¿±cego "
 "rozwi±zania."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Nastêpuj±ce dzia³ania rozwi±¿± problemy z zale¿no¶ciami:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Zaakceptowaæ rozwi±zanie? [Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Porzucono próby rozwi±zania problemów z zale¿no¶ciami."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Dostêpne s± nastêpuj±ce polecenia:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Plik do zapisu stanu procedury naprawy zale¿no¶ci: "
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Nie mo¿na otworzyæ %s do zapisu"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "B³±d w czasie zapisu stanu procedury naprawy zale¿no¶ci do %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Nieprawid³owa odpowied¼. Proszê podaæ jedno z nastêpuj±cych poleceñ:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 "Nie znaleziono rozwi±zañ przed up³ywem limitu czasu. Próbowaæ dalej? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Nieprawid³owa odpowied¼. Proszê wpisaæ \"y\" lub \"n\"."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Nie mo¿na rozwi±zaæ problemów z zale¿no¶ciami!"
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Nie ma wiêcej rozwi±zañ."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: Nale¿y podaæ przynajmniej jedno wyra¿enie do wyszukania\n"
@@ -1275,7 +1279,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Nie mo¿na wyczy¶ciæ katalogów z listami"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Usuwanie nieaktualnych plików pakietów"
 
@@ -2186,7 +2190,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Uwaga: interfejs pe³noekranowy zignoruje -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Saper"
 
@@ -2394,7 +2398,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 18 10 35 9 10 2 1 1 12 14 32 19 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pakiet"
 
@@ -3977,35 +3981,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [wersja %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Kontynuuj"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Przerwij instalacjê"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Przegl±d planowanych dzia³añ"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Przegl±danie i modyfikowanie akcji do wykonania"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Przegl±d"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Niektóre pakiety mia³y niespe³nione zale¿no¶ci. Wprowadzono zmiany:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Nie istnieje rozwi±zanie problemów z zale¿no¶ciami!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4014,7 +4018,7 @@
 "Przy naprawianiu problemów z zale¿no¶ciami przekroczono limit czasu (wci¶nij "
 "\"%s\" by próbowaæ dalej)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4022,25 +4026,25 @@
 "Instalowanie/usuwanie pakietów wymaga uprawnieñ administratora, których nie "
 "posiadasz. Czy chcesz siê prze³±czyæ na konto administratora?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Prze³±cz"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Nie prze³±czaj"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Trwa uaktualnianie listy pakietów lub instalacja."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Nie jest zaplanowana instalacja, uaktualnienie ani usuniêcie ¿adnych "
 "pakietów."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4050,7 +4054,7 @@
 "pakiety mog³yby zostaæ uaktualnione, jednak wybrano pozostawienie ich w "
 "bie¿±cych wersjach. Wci¶nij \"U\" aby przygotowaæ uaktualnienie."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4058,111 +4062,111 @@
 "Uaktualnianie listy pakietów wymaga uprawnieñ administratora, których nie "
 "posiadasz. Czy chcesz siê prze³±czyæ na konto administratora?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Strata czasu na poszukiwanie min"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Nie mo¿na czy¶ciæ archiwum w czasie pobierania pakietów"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Usuwanie pobranych plików"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Usuniêto pobrane pliki pakietów"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Usuniêto nieaktualne pliki pakietów, zwalniaj±c %sB na dysku."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Wyczerpano wszystkie rozwi±zania."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Poszukuj±c rozwi±zania przekroczono limit czasu."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Nie mo¿na znale¼æ rozwi±zania do zastosowania."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Nie mo¿na otworzyæ %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "B³±d w czasie zapisu stanu procedury naprawy zale¿no¶ci"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Plik do zapisu stanu procedury naprawy zale¿no¶ci:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "Za^instaluj/usuñ pakiety"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Przeprowadza zaplanowane instalacje/usuniêcia"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Uaktualnij listê pakietów"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Sprawdza dostêpno¶æ nowszych wersji pakietów"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Zapomnij o nowo¶ciach"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Usuwa informacje, które pakiety s± nowe"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Wyczy¶æ ^archiwum pakietów"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Usuwa wszystkie pobrane wcze¶niej pliki"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "^Usuñ nieaktualne pliki"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Usuwa pliki pakietów, które nie s± dostêpne do pobrania"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Zaznacz ^do uaktualnienia"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Zaznacza do uaktualnienia wszystkie mo¿liwe nie zatrzymane pakiety"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Saper"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Administrator"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4170,68 +4174,68 @@
 "U¿ywa \"su\" do uzyskania uprawnieñ administratora. Program zostanie "
 "zrestartowany, ale ustawienia bêd± zachowane"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Od¶wie¿ archiwum pakietów"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Ponownie odczytuje archiwum pakietów"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Zakoñcz"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Koñczy program"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Cofa ostatni± operacjê lub grupê operacji"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instaluj"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Dodaje wybrany pakiet do instalowanych/uaktualnianych"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Usuñ"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Dodaje wybrany pakiet do usuwanych"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Wyczy¶æ"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Dodaje wybrany pakiet do usuwanych wraz z plikami konfiguracyjnymi"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Pozostaw"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Odwo³uje planowane dzia³ania na wybranym pakiecie"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Zatrzymaj"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4239,11 +4243,11 @@
 "Odwo³uje planowane dzia³ania na wybranym pakiecie i zapobiega jego "
 "uaktualnieniom w przysz³o¶ci"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "^Automatyczny"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4251,11 +4255,11 @@
 "Oznacza wybrany pakiet jako zainstalowany automatycznie, czyli przeznaczony "
 "do usuniêcia, gdy nie bêdzie przez nic wymagany"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "¯±^dany"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4263,11 +4267,11 @@
 "Oznacza wybrany pakiet jako zainstalowany rêcznie i nie podlegaj±cy "
 "automatycznemu usuwaniu"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "Za^blokuj wersjê"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4275,203 +4279,203 @@
 "Nie zezwala na instalacjê kandyduj±cej wersji wybranego pakietu; nowsze "
 "wersje bed± instalowane normalnie"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformacje"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Wy¶wietla szczegó³owe informacje o wybranym pakiecie"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Dziennik zmian"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Wy¶wietla dziennik zmian wybranego pakietu"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Znajd¼"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Szuka pakietu"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Znajd¼ ^nastêpny"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Powtarza wyszukiwanie"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Filtruj"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Ogranicza wy¶wietlan± listê pakietów"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Usuñ filtr"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Usuwa ograniczenie wy¶wietlanej listy pakietów"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Znajd¼ ^problem"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Szuka kolejnego pakietu z niespe³nionymi zale¿no¶ciami"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Opcje ^interfejsu"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Zmienia opcje dotycz±ce interfejsu u¿ytkownika"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Zale¿no¶ci"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Zmienia opcje dotycz±ce zale¿no¶ci miêdzy pakietami"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Ró¿ne"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Zmienia ró¿ne inne opcje programu"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Przywróæ domy¶lne"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Przywraca wszystkim opcjom warto¶ci domy¶lne"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Nastêpny"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Wy¶wietla nastêpny widok"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Poprzedni"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Wy¶wietla poprzedni widok"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Zamknij"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Zamyka bie¿±cy widok"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nowy ^widok pakietów"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Tworzy nowy, standardowy widok listy pakietów"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nowa przegl±darka ^kategorii"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Pozwala na przegl±danie pakietów wed³ug kategorii"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^O Aptitude"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Wy¶wietla informacje o programie"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Pomoc"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Wy¶wietla pomoc Aptitude"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "Podrêcznik ^u¿ytkownika"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Wy¶wietla podrêcznik u¿ytkownika programu"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Wy¶wietla najczê¶ciej zadawane pytania na temat Aptitude"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^Nowo¶ci"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Wy¶wietla najwa¿niejsze zmiany w kolejnych wersjach programu"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licencja"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Wy¶wietla warunki rozpowszechniania programu"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Akcje"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Znajd¼"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opcje"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Widoki"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4479,11 +4483,11 @@
 msgstr ""
 "%s: Menu  %s: Pomoc  %s: Zakoñcz  %s: Uaktualnij  %s: Instaluj/usuñ pakiety"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "t"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "n"
 
@@ -4554,7 +4558,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au! SIGQUIT, czas umieraæ..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/pt.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/pt.po	(original)
+++ branches/aptitude-0.3/aptitude/po/pt.po	Wed Jul  6 22:10:50 2005
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-23 15:23+0200\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianPT.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -943,63 +943,67 @@
 "Ajustes irão causar que a solução actual seja descartada e recalculada "
 "conforme necessário."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "As seguintes acções irão resolver estas dependências:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Aceitar esta solução? [Y/n/q?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Abandonar todos os esforços para resolver estas dependências."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Estão disponíveis os seguintes comandos:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Ficheiro para onde escrever o estado: "
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Não foi possível abrir %s para gravação"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Erro ao escrever o estado do resolver para %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Resposta inválida; por favor introduza um dos seguintes comandos:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 "não foi encontrada solução dentro do tempo alocado.  Tentar melhor? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Resposta inválida; por favor introduza 'y' ou 'n'."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Não foi possível resolver dependências!  A desistir..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Sem mais soluções."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "pesquisa: Deve fornecer pelo menos um termo para pesquisar\n"
@@ -1302,7 +1306,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Não foi possível limpar a lista de directórios"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "A apagar os ficheiros obsoletos a que foi feito o download"
 
@@ -2246,7 +2250,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Aviso: o interface visual irá ignorar -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Campo Minado"
 
@@ -2457,7 +2461,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pacote"
 
@@ -4051,35 +4055,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versão %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Continuar Mesmo"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Abortar a Instalação"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Previsão da instalação de pacotes"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ver e/ou ajustar as acções a serem executadas"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Ver antes"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns pacotes estavam quebrados e foram corrigidos:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Não existe solução para estes problemas de dependências!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4088,7 +4092,7 @@
 "Esgotou o tempo enquanto tentava resolver dependências (carregue em \"%s\" "
 "para tentar melhor)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4096,26 +4100,26 @@
 "Instalar/remover pacotes requer privilégios administrativos, que você "
 "actualmente não possui.  Deseja mudar para a conta de root?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Tornar-se root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Não tornar-se root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Uma actualização da lista de pacotes ou uma instalação já está em execução."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Nenhuns pacotes estão agendados para serem instalados, removidos ou "
 "actualizados."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4125,7 +4129,7 @@
 "podiam ser actualizados, mas você escolheu não os actualizar. Carregue em \"U"
 "\" para preparar uma actualização."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4133,23 +4137,23 @@
 "Actualizar a lista de pacotes requer privilégios administrativos, que você "
 "actualmente não possui. Deseja mudar para a conta de root ?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Limpar enquanto um download está em curso não é permitido"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "A apagar ficheiros transferidos"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Ficheiros de pacotes transferidos foram apagados"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -4158,90 +4162,90 @@
 "Ficheiros de pacotes obsoletos transferidos foram apagados, libertanto %sB "
 "de espaço em disco."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Todas as soluções esgotadas."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Esgotou o tempo enquanto tentava encontrar uma solução."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Não foi possível encontrar uma solução para aplicar."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Não foi possível abrir %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Erro enquando fazia o dump do estado de resolver"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Ficheiro para o qual deve ser feito o dump do estado do resolver:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Instalar/remover pacotes"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Executar todas as instalações e remoções pendentes"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^U Actualizar a lista de pacotes"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Procurar por novas versões de pacotes"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^F Esquecer novos pacotes"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer que pacotes são \"novos\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^C Limpar cache de pacotes"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Apagar ficheiros de pacotes que foram previamente transferidos"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Limpar ficheiros ^obsoletos"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Apagar ficheiros de pacotes que não podem mais ser transferidos"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "^U Marcar Actualizáveis"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 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/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^P Jogar Campo Minado"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^B Tornar-se root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4249,71 +4253,71 @@
 "Executar 'su' para tornar-se root; isto irá reiniciar o programa, mas as "
 "suas configurações serão preservadas"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Reler cache de pacotes"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Reler a cache de pacotes"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Q Terminar"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfaz a última operação ou grupo de operações"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Marcar o pacote actualmente seleccionado para instalação ou actualização"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Remover"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o pacote actualmente seleccionado para remoção"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marcar o pacote actualmente seleccionado e seus ficheiros de configuração "
 "para serem removidos"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Ficar com"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar qualquer acção no pacote seleccionado"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Manter"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4321,11 +4325,11 @@
 "Cancelar qualquer acção no pacote seleccionado e protegê-lo de futuras "
 "actualizações"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Marcar ^Auto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4333,11 +4337,11 @@
 "Marcar o pacote seleccionado como tendo sido automaticamente instalado; será "
 "automaticamente removido se nenhum outro pacote depender dele"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Marcar ^Manual"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4345,11 +4349,11 @@
 "Marcar o pacote seleccionado como tendo sido manualmente instalado; não irá "
 "ser removido a menos que você o remova manualmente"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^F Proibir Versão"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4357,205 +4361,205 @@
 "Proíbir a versão candidata do pacote seleccionado de ser instalada; versões "
 "mais recentes deste pacote serão instaladas como de costume"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformação"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Mostrar mais informações acerca do pacote seleccionado"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^C Registo de alterações"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar o registo de alterações Debian do pacote seleccionado"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^F Procurar"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Procurar por um pacote"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "^A Procurar de novo"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Repetir a última procura"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Limitar a vista"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Aplicar um filtro à lista de pacotes"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^U Retirar limite à vista"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Remover o filtro da lista de pacotes"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "^B Procurar Quebrado"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Procurar o próximo pacote com dependências não satisfeitas:"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^UI Opções da interface"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Altera as configurações que afectam a interface do utilizador"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Gestão de ^Dependências"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Altera as configurações que afectam a forma como as dependências de pacotes "
 "são geridas"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Miscelânea"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Altera as configurações diversas do programa"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Reverter as opções"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Reset a todas as configurações para os padrões do sistema"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^N Próximo"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Visualizar a próxima página"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^P Anterior"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Visualizar a página anterior"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^C Fechar"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Fechar esta página"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nova ^Visão de Pacote"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Criar uma nova visão de pacote padrão"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "^B Novo Navegador de Categorias"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Navega pelos pacotes por categoria"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^A Sobre"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Ver informações sobre este programa."
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^H Ajuda"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Visualiza a ajuda on-line"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Manual do Utilizador"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Ver o manual do programa detalhado"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Ver a lista de perguntas frequentes"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^NOTICIAS"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Ver as alterações importantes feitas em cada versão de "
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licença"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Ver os termos sob os quais pode copiar o programa"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Acções"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Procurar"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opções"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4563,11 +4567,11 @@
 msgstr ""
 "%s: Menu %s: Ajuda %s: Terminar %s: Actualizar %s: Instalar/Remover Pcts."
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "chave_sim"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "chave_não"
 
@@ -4637,7 +4641,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ouch ! Recebi um SIGQUIT, tou a morrer..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/pt_BR.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/pt_BR.po	(original)
+++ branches/aptitude-0.3/aptitude/po/pt_BR.po	Wed Jul  6 22:10:50 2005
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-05-18 11:23-0300\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -948,68 +948,72 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Os pacotes a seguir possuem dependências não satisfeitas :\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Os pacotes a seguir estão QUEBRADOS :"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Não foi possível abrir %s para gravação"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Erro ao gravar o arquivo de estado"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Resposta inválida. Por favor, informe um comando válido ou '?' para ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Resposta inválida. Por favor, informe um comando válido ou '?' para ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "busca : Você deve fornecer pelo menos um termo para busca\n"
@@ -1311,7 +1315,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Não foi possível limpar os diretórios de listas"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Apagando arquivos baixados obsoletos"
 
@@ -2253,7 +2257,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Campo Minado"
 
@@ -2465,7 +2469,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pacote"
 
@@ -4077,44 +4081,44 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Versões"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Realmente Continuar"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Abortar Instalação"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Previsão da instalação de pacotes"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Visualizar e/ou ajustar as ações que serão executadas"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^P Anterior"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns pacotes estavam quebrados e foram consertados"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4123,24 +4127,24 @@
 "Instalar/remover pacotes requer privilégios administrativos, os quais você\n"
 "atualmente não possui. Você gostaria de mudar para a conta de root?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Tornar-se root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Não tornar-se root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Uma atualização da lista de pacotes ou instalação já está em execução."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Nenhum pacote está agendado para ser instalado, removido ou atualizado."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4153,7 +4157,7 @@
 "los.\n"
 "Digite \"U\" para preparar uma atualização."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4163,114 +4167,114 @@
 "você\n"
 " atualmente não possui. Você gostaria de mudar para a conta de root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Limpar enquanto um download está em progresso não é permitido"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Apagando arquivos baixados"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Arquivos de pacotes baixados foram apagados"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Arquivos de pacotes baixados obsoletos foram apagados"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Não foi possível abrir %s para gravação"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Instalar/remover pacotes"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Executar todas as instalações e remoções pendentes"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^U Atualizar a lista de pacotes"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Checar por novas versões de pacotes"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^F Esquecer novos pacotes"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer quais pacotes são \"novos\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^C Limpar cache de pacotes"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Apagar arquivos de pacotes que foram previamente baixados"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Limpar arquivos ^obsoletos"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Apagar arquivos de pacotes que não podem mais ser baixados"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "^U Marcar Atualizáveis"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 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 "
 "mantidos"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^P Jogar Campo Minado"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^B Tornar-se root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4279,70 +4283,70 @@
 "Executar 'su' para tornar-se root. Isto irá reiniciar o programa, mas\n"
 " suas configurações serão preservadas"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Recarregar cache de pacotes"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Recarregar o cache de pacotes"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Q Finalizar"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfaz a última operação ou grupo de operações de pacote"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marcar o pacote atualmente selecionado para instalação ou atualização"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Remover"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o pacote atualmente selecionado para remoção"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "Ex^purgar"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marcar o pacote atualmente selecionado e seus arquivos de configuração para "
 "remoção"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^K Manter"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar quaisquer ações nos pacotes selecionados"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^H Mantido"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4350,11 +4354,11 @@
 "Cancelar quaisquer ações nos pacotes selecionados e protegê-los de "
 "atualizações futuras"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Marcar ^Auto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4363,11 +4367,11 @@
 "Marcar o pacote selecionado como tendo sido automaticamente instalado;\n"
 "ele será automaticamente removido caso nenhum outro pacote dependa dele"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Marcar ^Manual"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4376,11 +4380,11 @@
 "Marcar o pacote selecionado como tendo sido manualmente instalado;\n"
 "ele não será removido a menos que você o remova manualmente"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^F Proibir Versão"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4389,205 +4393,205 @@
 "Proibir a versão candidata do pacote selecionado de ser instalada;\n"
 "novas versões do pacotes serão instaladas normalmente"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformação"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Exibir maiores informações sobre o pacote selecionado"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^C Log de mudanças"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Exibir o log de mudanças Debian do pacote selecionado"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^F Encontrar"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Procurar por um pacote"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "^A Procurar Novamente"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Repetir a última procura"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Limitar Exibição"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "^Aplicar um filtro à lista de pacotes"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^U Deslimitar Exibição"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Remover o filtro da lista de pacotes"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "^B Encontrar Quebrado"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontra o próximo pacote com dependências não satisfeitas"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^U Opções da interface"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Muda as configurações que afetam a interface do usuário"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Gerencimento de ^Dependências"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Muda as configurações que afetam como as dependências de pacotes são tratadas"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Miscelânea"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Muda as configurações miscelânicas do programa"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Reverter as opções"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Reverte todas as configurações para os padrões do sistema"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^N Próximo"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Visualizar próxima tela"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^P Anterior"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Visualizar tela anterior"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^C Fechar"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Fechar esta tela"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nova ^Visão de Pacote"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Criar uma nova visão de pacote padrão"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "^B Novo Navegador de Categorias"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Navega pelos pacotes por categoria"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^A Sobre"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Visualiza informações sobre este programa"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^H Ajuda"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Visualizar a ajuda on-line"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Manual do Usuário"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Visualizar o manual do programa detalhado"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Visualizar uma lista de perguntas feitas frequentemente"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Visualizar as mudanças importantes feitas em cada versão do programa"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licença"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Visualizar os termos sob os quais você pode copiar o programa"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Ações"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Procurar"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opções"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Visões"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4596,11 +4600,11 @@
 "%s: Menu %s: Ajuda %s: Finaliza %s: Atualiza %s: Baixar/Instalar/Remover "
 "Pcts."
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "s"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "n"
 
@@ -4671,7 +4675,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ai! Recebi um SIGQUIT, morrendo..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/ro.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ro.po	(original)
+++ branches/aptitude-0.3/aptitude/po/ro.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-04-19 03:49+0300\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -947,70 +947,74 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Următoarele pachete n-au îndeplinit dependenţele:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Următoarele pachete sunt DETERIORATE:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Nu pot deschide %s pentru scriere"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Eroare în timpul scrierii fişierului de stare"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Răspuns nevalabil.  Vă rog introduceţi o comandă valabilă sau '?' pentru "
 "ajutor.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Răspuns nevalabil.  Vă rog introduceţi o comandă valabilă sau '?' pentru "
 "ajutor.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "căutare: Trebuie să furnizaţi cel puţin un termen de căutare\n"
@@ -1310,7 +1314,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Nu pot curăţa directoarele listă"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Ştergere fişierele învechite descărcate"
 
@@ -2242,7 +2246,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Detector de mine"
 
@@ -2454,7 +2458,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pachet"
 
@@ -4067,44 +4071,44 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Versiuni"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Continuă întradevăr"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Renunţă la instalare"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Previzualizează pachetele instalate"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Vizualizează şi/sau ajustează acţiunile ce vor fi executate"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^Precedent"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Unele pachete au fost deteriorate ÅŸi s-au reparat"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Pierdere de timp încercând găsirea minelor"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4113,25 +4117,25 @@
 "Instalarea/ştergerea pachetelor necesită privilegii administrative, care\n"
 "acum nu le aveţi.  Vreţi să schimb către contul de root?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Devin root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Nu devin root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "O actualizare de listă de pachete sau o instanţă de instalare deja ocupă "
 "locul."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Nici un pachet nu-i programat sa fie instalat, şters sau înnoit."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4143,7 +4147,7 @@
 "Unele pachete ar putea fi înnoite, dar n-aţi ales asta.\n"
 "Apăsaţi \"U\" pentru a pregăti o înnoire."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4153,114 +4157,114 @@
 "ce\n"
 "n-aveţi acum.  Vreţi să schimb către contul de root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Pierdere de timp încercând găsirea minelor"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Curăţarea în timp ce descărcarea este în desfăşurare nu este permisă"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Ştergere fişiere descărcate"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Fişierele pachetelor descărcate au fost şterse"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Fişierele pachetelor învechite şi descărcate au fost şterse"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Pierdere de timp încercând găsirea minelor"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Nu pot deschide %s pentru scriere"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Instalează/şterge pachete"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Execută toate instalările şi ştergerile nerezolvate"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "Act^ualizează lista de pachete"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Verificare pentru noi versiuni de pachete"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "Uită de noile pachete"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Uită de pachetele care sunt \"noi\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Curăţă cache-ul pachetelor"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Şterge fişierele pachetelor care-au fost anterior descărcate"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Curăţă fişierele învechite"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Şterge fişierele pachetelor ce nu mai pot fi descărcate"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Marchează ca posibil de înnoit"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marchează toate pachetele ce ar putea fi înnoite care nu sunt reţinute "
 "pentru înnoire"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "Joacă Detectorul de Mine"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Devenire root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4269,70 +4273,70 @@
 "Execută 'su' pentru a deveni root; asta va reporni programul, dar\n"
 "setările dvs. vor fi păstrate"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Reîncarcă cache-ul pachetului"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Reîncărcare cache-ul pachetului"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "IeÅŸire"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "IeÅŸire din program"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Renunţă"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Renunţă la ultima operaţiune de pachet sau grup de operaţiuni"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instalează"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Semnalizează pachetul curent selectat pentru instalare sau înnoire"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "Åžte^rge"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Semnalizează pachetul curent selectat pentru ştergere"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "Curăţă"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Semnalizează pachetul curent selectat şi fişierele sale de configurare "
 "pentru ÅŸtergere"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "Å¢ine"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Anulează orice acţiune pentru pachetul selectat"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "Reţine"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4340,11 +4344,11 @@
 "Anulează orice acţiune pentru pachetul selectat, şi protejează-l de viitoare "
 "înnoiri"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Marchează ^automat"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4353,11 +4357,11 @@
 "Marchează pachetul selectat ca fiind instalat automat;\n"
 "va fi şters automat dacă nici un alt pachet nu depinde de el"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Marchează ^manual"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4366,11 +4370,11 @@
 "Marchează pachetul selectat ca fiind instalat manual;\n"
 "nu va fi şters decât dacă îl veţi şterge manual"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "Interzice versiunea"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4379,205 +4383,205 @@
 "Interzice versiunea candidat pentru pachetul selectat de a fi instalat;\n"
 "noile versiuni ale pachetului vor fi instalate ca de obicei"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformaţii"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Afişează mai multe informaţii despre pachetul selectat"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "Jurnal de modifi^cări"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Afişează jurnalul de modificări Debian pentru pachetul selectat"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "Găseşte"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Căutarea unui pachet"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Mai găseşte od^ată"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Repetă ultima căutare"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Limitează afişajul"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Aplică un filtru listei de pachete"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "Ne-limitează afişajul"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Åžterge filtrul din lista de pachete"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Găseşte deteriorat"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Găseşte următorul pachet cu dependenţe nesatisfăcute"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Opţiuni interfaţă ^utilizator"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Schimbă ajustările ce afectează interfaţa utilizatorului"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Manevrarea ^dependenţelor"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Schimbă ajustările ce afectează modul în care sunt manevrate dependenţele"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "Diverse"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Schimbă diverse ajustări ale programului"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Revenire opţiuni"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Refacere toate ajustările la cele implicite ale sistemului"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "Următorul"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Vizualizare următorul afişaj"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Precedent"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Vizualizare afiÅŸaj precedent"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "ÃŽn^chide"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "ÃŽnchide acest afiÅŸaj"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Nouă ^vizualizare pachet"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Crearea unei noi vizualizări de pachet implicite"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nouă răsfoire de categorii"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Răsfoieşte pachetele după categorie"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "Despre"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Vizualizare informaţii despre acest program"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "Ajutor"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Vizualizare taste de comenzi"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Manual de utilizare"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Vizualizarea manualului detaliat al programului"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "Întrebări ^frecvente"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Vizualizare listă de întrebări frecvente"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Vedeţi schimbările importante făcute în fiecare versiune a programului"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licenţă"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Vedeţi condiţiile în care puteţi copia programul"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Acţiuni"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Căutare"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Opţiuni"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Vizualizări"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Ajutor"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4586,11 +4590,11 @@
 "%s: Meniu  %s: Ajutor  %s: Ieşire  %s: Actualizare  %s: Descărcare/Instalare/"
 "Åžtergere pachete"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "no_key"
 
@@ -4662,7 +4666,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Aoleeu!  Am primit SIGHQUIT, mooooor...\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/ru.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/ru.po	(original)
+++ branches/aptitude-0.3/aptitude/po/ru.po	Wed Jul  6 22:10:50 2005
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: aptitude-ru\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-14 21:04+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at id.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -934,63 +934,67 @@
 "Сверка приведёт к отмене текущего решения и вычислении его заново, если это "
 "понадобиться."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Следующие действия разрешат зависимости:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Принять данное решение? [Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Отмена всех результов по разрешению данных зависимостей."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Возможны следующие команды:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Файл для записи состояния разрешателя в:"
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Не удаётся открыть %s для записи"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Ошибка записи состояния разрешателя в %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Неверный ответ; можно вводить одну из следующих команд:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 "За отведённое время решения не было найдено. Попытаться тщательнее? [Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Неверный ответ; можно ввести 'y' или 'n'."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Не удалось разрешить зависимости!  Ничего не получается..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Больше решений нет."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "поиск: Вы должны ввести хотя бы одно слово\n"
@@ -1290,7 +1294,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Не удалось очистить каталог list"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Удаление устаревших загруженных файлов"
 
@@ -2207,7 +2211,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Внимание: в визуальном интерфейсе игнорируется -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Сапёр"
 
@@ -2416,7 +2420,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Пакет"
 
@@ -3991,35 +3995,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [версия %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Продолжить"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Отменить установку"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Обзор устанавливаемых пакетов"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Показать и/или выверить действия, которые будут выполнены"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Некоторые неработоспособные пакеты были исправлены:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Решения данной проблемы с зависимостями не существует!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -4028,7 +4032,7 @@
 "Убьём время, пока ищется решение проблемы с зависимостями (нажмите \"%s\", "
 "чтобы опытаться тщательнее)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4036,23 +4040,23 @@
 "Для установки/удаления пакетов требуются административные права, которыми вы "
 "в данный момент не обладаете. Получить права суперпользователя? "
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Стать суперпользователем"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Не становиться суперпользователем"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Запуск обновления списка пакетов или установка уже произведены."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Нет пакетов для установки, удаления или обновления."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4062,7 +4066,7 @@
 "быть обновлены, но вы не задали их обновление. Введите \"U\", чтобы пометить "
 "их для обновления."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4070,23 +4074,23 @@
 "Для обновления списка пакетов требуются административные права, которыми вы "
 "в данный момент не обладаете. Получить права суперпользователя? "
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Убьём время в поисках мин"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Очистка во время процесса загрузки невозможна"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Удаление загруженных файлов"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Загруженные файлы были удалены"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -4095,89 +4099,89 @@
 "Загруженные файлы с устаревшими пакетами были удалены, освободится %sБ "
 "дискового пространства."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Больше решений нет."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Убьём время, пока ищется решение."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Не удалось найти решение, которое можно было бы применить."
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Не удалось открыть %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Ошибка во время сброса состояния разрешателя"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Файл, в который будет сброшено состояние разрешателя:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Установить/удалить пакеты"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Выполнить все незаконченные установки и удаления"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Обновить список пакетов"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Проверить, есть ли новые версии пакетов"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Забыть о новых пакетах"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Забыть о \"новых\" пакетах"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Очистить кэш пакетов"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Удалить ранее загруженные файлы пакетов"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Очистить ^устаревшие файлы"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Удалить файлы пакетов, которые больше никогда не будут загружены"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Пометить ^обновляемые"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Пометить все обновляемые пакеты, которые не зафиксированы от обновления"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Играть в сапёра"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Стать суперпользователем"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4185,68 +4189,68 @@
 "Запуск 'su', чтобы стать суперпользователем. Это приведёт к перезапуску "
 "программы, но ваши настройки будут сохранены"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Перезагрузить кэш пакетов"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Перезагрузить кэш пакетов."
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Выйти"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Завершить работу программы"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Откат"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Отменить последнюю операцию с пакетом или группу операций"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Install"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Пометить выделенный пакет для установки или обновления"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Remove"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Пометить выделенный пакет для удаления"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Purge"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Пометить выделенный пакет для удаления вместе с его файлами настройки"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Keep"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Отменить любое действие над выделенным пакетом"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Hold"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4254,11 +4258,11 @@
 "Отменить любое действие над выделенным пакетом и защитить его от дальнейших "
 "обновлений"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Отметить ^Auto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4266,11 +4270,11 @@
 "Отметить выделенные пакеты, как будто они были установлены автоматически; "
 "они будут автоматически удалены, если не останется пакетов, от них зависящих"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Отметить ^Manual"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4278,11 +4282,11 @@
 "Отметить выделенные пакеты, как будто они были установлены вручную; они не "
 "будут удалены, пока вы вручную не сделаете этого"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Forbid версию"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4290,203 +4294,203 @@
 "Запретить установку версии выделенного пакета; новые версии пакета будут "
 "устанавливаться как обычно"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformation"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Показать больше информации о выделенном пакете"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Показать Debian changelog выделенного пакета"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Find"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Найти пакет"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Найти ^Опять"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Повторить последний поиск"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Limit Display"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Применить фильтр к списку пакетов"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Un-Limit Display"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Снять фильтр со списка пакетов"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Найти ^Broken"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Найти следующий пакет с неудовлетворёнными зависимостями"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^Настройки интерфейса"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Изменить настройки, относящиеся к интерфейсу пользователя"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Работа с зависимостями"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Изменить настройки, относящиеся к тому как обрабатываются зависимости"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Разное"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Изменить другие настройки программы"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Отменить настройки"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Сбросить все настройки в значения по умолчанию"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Следующее"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Перейти к следующему окну"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Предыдущее"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Перейти к предыдущему окну"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Закрыть"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Закрыть это окно"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Новое ^окно Пакета"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Создать новое окно пакета по умолчанию"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Новый ^браузер категорий"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Показывать пакеты согласно категориям"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^О программе"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Показать информацию об этой программе"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Помощь"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Показать страницу помощи"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Руководство пользователя"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Показать подробное руководство пользователя программы"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^ЧАВО"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Показать список часто задаваемых вопросов"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^NEWS"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Показать важные изменения, сделанные в каждой версии "
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Лицензия"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Показать условия, согласно которым вы можете копировать программу"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Действия"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Поиск"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Параметры"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Окна"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Помощь"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4494,11 +4498,11 @@
 msgstr ""
 "%s: Меню  %s: Помощь  %s: Выход  %s: Обновить  %s: Загруз/Устан/Удал пкт"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "no_key"
 
@@ -4568,7 +4572,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ой!  Получен сигнал SIGQUIT, выход..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/sk.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/sk.po	(original)
+++ branches/aptitude-0.3/aptitude/po/sk.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-12 23:31+0100\n"
 "Last-Translator: Stanislav Valášek <valasek at fastmail.fm>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -920,64 +920,68 @@
 msgstr ""
 "Úprava spôsobí, že súčasné riešenie bude zahodené a nutná rekalkulácia."
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Nasledujúce akcie vyriešia tieto závislosti:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Potvrdiť toto riešenie? [Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Ukončovanie všetkého úsilia na vyriešenie týchto závislostí."
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Nasledujúce prikazy sú dostupné:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Súbor, kde má byť zapísaný stav riešenia:"
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Nemôžem otvoriť %s na zápis"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Chyba pri zápise stavu riešenia do %s"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Chybná odpoveď; prosím zadajte jeden z nasledujúcich príkazov:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 "Počas prideleného času nebolo nájdené žiadne riešenie. Skúsiť dôkladnejšie? "
 "[Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Chybná odpoveď; prsím zadajte 'y' alebo 'n'."
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Nemožnosť vyriešenia závislostí! Vzdávam sa..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Žiadne ďalšie riešenia."
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "hľadanie: Musíte zadať aspoň jeden hľadaný výraz\n"
@@ -1277,7 +1281,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Nemôžem vyčistiť adresáre zoznamu"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Vymazávam staré stiahnuté súbory"
 
@@ -2174,7 +2178,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Varovanie: vizuálne rozhranie bude ignorovať -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Hľadanie mín"
 
@@ -2383,7 +2387,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Balík"
 
@@ -3941,35 +3945,35 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [verzia %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Skutočne Pokračovať"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Zrušiť Inštaláciu"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Náhľad inštalácie balíkov"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Zobrazí a/alebo upraví akcie, ktoré sa majú vykonať"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Niektoré balíky boli poškodené a podarilo sa ich opraviť:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Na tieto problémy so závislosťami neexistuje žiadne riešenie!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -3978,7 +3982,7 @@
 "Počas riešenia závislostí som presiahol čas (stlačte \"%s\" na dôkladnejšie "
 "hľadanie)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -3986,24 +3990,24 @@
 "Inštalácia/odobranie balíkov vyžaduje administrátorské práva, ktoré "
 "momentálne nemáte. Chcete sa prepnúť na účet root?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Stať sa rootom"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Nestať sa rootom"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Aktualizácia zoznamu balíkov alebo ich inštalácia už prebieha."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Žiadne balíky nie sú označené na inštaláciu, aktualizáciu alebo odstránenie."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4013,7 +4017,7 @@
 "balíky síce môžu byť aktualizované, ale vybrali ste, že sa nemajú "
 "aktualizovať.  Aktualizáciu môžete pripraviť klávesou \"U\"."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4021,111 +4025,111 @@
 "Aktualizácia zoznamu balíkov vyžaduje administrátorské práva, ktoré "
 "momentálne nemáte. Chcete sa prepnúť na účet root?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Zabiť čas hľadaním mín."
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Čistenie počas sťahovania nie je dovolené"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Vymazávam stiahnuté súbory"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Stiahnuté balíky boli vymazané"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Staré stiahnuté balíky boli vymazané, uvoľnilo sa %sB miesta na disku."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Všetky riešenia boli vyčerpané."
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Vypšal čas počas hľadania riešenia."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Nemôžem nájsť potvrdené riešenie"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Nemôžem otvoriť %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Nastala chyba pri ukladaní stavu riešenia"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Súbor, do ktorého má byť stav riešenia uložený:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Inštalovať/odstrániť balíky"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Vykoná všetky nevykonané inštalácie a odstraňovania"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Aktualizovať zoznam balíkov"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Zistí, či nie sú k dispozícii novšie verzie balíkov"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Zabudnúť nové balíky"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Zabudne, ktoré balíky sú \"nové\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Vyčistiť ^cache s balíkmi"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Vymaže stiahnuté súbory (balíky) z /var/cache/apt"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Vyčistiť staré súb^ory"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Vymaže súbory, ktoré sa už nedajú stiahnuť"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Označiť aktualizovateľné"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Označí všetky aktualizovateľné balíky, ktoré nie sú podržané"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "Zahrať si mínové ^pole"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Stať sa rootom"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4133,69 +4137,69 @@
 "Na prepnutie na užívateľa root spusťte 'su'; toto  reštartuje program, ale "
 "Vaše nastavenia budú zachované"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "Znovu načítať cache"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Znovu načítať obsah cache"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "Koniec"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Späť"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Vrátí späť poslední operaci alebo skupinu operácií s balíky"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Inštalovať"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Označí aktuálny vybraný balík na inštaláciu alebo aktualizáciu"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "Odst^rániť"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Označí aktuálny vybraný balík na odstránenie"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "Vyčistiť"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Označí aktuálny vybraný balík na odstránenie vrátane konfiguračných súborov"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "Ponechať"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Na vybranom balíku zruší všetky akcie"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "Podržať"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4203,11 +4207,11 @@
 "Na vybranom balíku zruší všetky akcie a ochráni ho pred budúcimi "
 "aktualizáciami."
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Označiť ^automaticky"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4215,11 +4219,11 @@
 "Označí vybraný balík, ako inštalovaný automaticky; ak na ňom nebudú závisieť "
 "iné balíky, bude automaticky odstránený"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Označiť ručne"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4227,11 +4231,11 @@
 "Označí vybraný balík, ako by bol nainštalovaný ručne; nebude odstránený, "
 "pokiaľ ho neodstránite sami"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "Zakázať ^verziu"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -4239,203 +4243,203 @@
 "Zakázať, aby sa kandidátska verzia balíku nainštalovala; novšie verzie "
 "balíku sa budú inštalovať ako zvyčajne"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^nformácie"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Na vybraný balík zobrazí ďalšie informácie"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "U vybraného balíku zobrazí zoznam zmien vykonaných správcom balíku"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "Hľadať"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Hľadá balík"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Hľadať znova"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Zopakuje posledné hľadanie"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "Obmedziť zobrazenie"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Na zoznam balíkov aplikuje výberový filter"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "Zrušiť obmedzenie"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Odstráni filter aplikovaný na zoznam balíkov"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Hľadať porušené"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hľadá ďalší balík s nesplnenými závislosťami"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Nastavenie zobrazenia"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Zmení nastavenia, ktoré ovplyvňujú užívateľské rozhranie"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Zmení nastavenia, ktoré ovplyvňujú spôsob riešenia závislostí"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "Rôzne"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Zmení rôzne nastavenia programu"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "Pôvodné nastavenia"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Vráti všetky nastavenia do pôvodného stavu"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "Ďalší"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Zobrazí ďalší pohľad"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Predchádzajúce"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Zobrazí predchádzajúci pohľad"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "Zavrieť"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Zavrie tento pohľad"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "No^vý pohľad na balíky"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Vytvorí nový štandardný pohľad na balíky"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Nový prehliadač kategorií"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Prehliada balíky podľa kategorií"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "O progr^ame"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Zobrazí informácie o programe"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Zobrazí on-line pomoc"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "Užívatelský ^manuál"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Zobrazí podrobný manuál tohto programu"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Zobrazí zoznam často kladených otázok"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^NOVINKY"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Zobraziť dôležité zmeny v každej verzií programu"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Zobrazí podmienky, za ktorých môžete program šíriť"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Akcie"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Hľadat"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Voľby"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Pohľady"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4443,11 +4447,11 @@
 msgstr ""
 "%s: Menu  %s: Pomoc  %s: Koniec  %s Aktualizácia  %s Stiahnutie/Inštalácia"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "ano_key"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "ne_key"
 
@@ -4517,7 +4521,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au! Dostal ma SIGQUIT, umieram..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/tl.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/tl.po	(original)
+++ branches/aptitude-0.3/aptitude/po/tl.po	Wed Jul  6 22:10:50 2005
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-03-30 16:02+0800\n"
 "Last-Translator: Ryan Escarez <rescarez at gmail.com>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -947,68 +947,72 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Ang mga sumusunod na pakete ay may kulang na dependensiya:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Ang mga sumusunod na pakete ay SIRA:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Error sa pagsulat ng state file"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Di tanggap na sagot.  Pakibigay ng tanggap na utos o '?' para sa tulong.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Di tanggap na sagot.  Pakibigay ng tanggap na utos o '?' para sa tulong.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr ""
@@ -1310,7 +1314,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Hindi malinis ng maayos ang listahan ng directories"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Binubura ang matagal ng nakuhang mga files"
 
@@ -2247,7 +2251,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Taga-walis ng ginto"
 
@@ -2459,7 +2463,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Pakete"
 
@@ -4084,44 +4088,44 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Bersyon"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Talagang magpatuloy"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Hintuin ang pagluklok"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Preview ng pagluklok ng mga pakete"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Tignan at/o ibagay ang aksyon na isasagawa"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "^Nakaraan"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Ang ibang pakete ay basag at iniayos"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4131,23 +4135,23 @@
 "pribilhiyo, na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Maging root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Huwag maging root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Ang package-list update o install run ay kasalukuyan nasa pwesto."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Walang pakete ang nakatakda na iluklok, tanggalin, o i-upgrade."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4160,7 +4164,7 @@
 "iapgreyd\n"
 "ang mga ito. Pindutin ang \"U\" upang maghanda ng pag-apgreyd."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4170,114 +4174,114 @@
 "na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 "Paglilinis habang ang pagkuha ay nasa progreso ay hindi pina hi-hintulutan"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Binubura ang mga na-download na files"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Nakuhang pakete files ay nabura na"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Laos na talaksang pakete ay nabura na"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Iluklok/tanggalin ang mga pakete"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Gawin ang lahat ng naka-binbin na instal at mga tatanggalin"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Update ang pakete list"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Suriin para sa mga bagong bersyon ng mga pakete"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Kalimutan ang mga bagong pakete"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Kalimutan kung ano amg mga pakete na \"bago\""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Linisin ang mga cache ng pakete"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Burahin ang pakete files na na-download ng nakaraan"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Linisin ang  ^obsolete files"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Alisin ang pakete files na hindi na ma-download"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Markahan ng ^Upgradable"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 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/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Maglaro ng Minesweeper"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Maging root"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4287,71 +4291,71 @@
 "iyong\n"
 "settings ay hindi magagalaw"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Reload ang pakete cache"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Reload ang pakete cache"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Umalis"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Lumabas sa programa"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Ibalik"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "Ulitin ang huling pakete operation o grupo ng operations"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Instal"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Bandilaan ang kasalukuyan ay napiling pakete para sa installation o upgrade"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Tanggalin"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Bandilaan ang kasalukuyan ay napiling pakete para sa pagalis"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Purge"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Bandilaan ang kasalukuyan ay napiling pakete at ang configuration files para "
 "sa pagtanggal"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Itago"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Kansel ang anumang aksyon sa napiling pakete"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Pigilin"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4359,11 +4363,11 @@
 "Kansel ang anumang aksyon sa napiling pakete, at protektahan sa balang araw "
 "na upgrades"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Markahang ^Auto"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4372,11 +4376,11 @@
 "Markahan ang napiling pakete bilang otomatikong na instal;\n"
 "itoy otomatikong ma-tatanggal pag walang anomang paketeng naka-depende dito"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Markahang ^Manual"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4385,11 +4389,11 @@
 "Markahan ang napiling pakete bilang manually na na-instal;\n"
 "itoy hindi ma-tatanggal ngunit kung itoy iyong manually na tatanggalin"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Forbid Na Salin"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4398,206 +4402,206 @@
 "Ipagbawal ang kandidato na salin ng piniling pakete na ma-installed;\n"
 "bagong salin ng pakete ay ma-installed syempre"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "I^mpormasyon"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Pakita ang higit na impormasyon tungkol sa piniling pakete"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Ipakita ang Debian changelog ng napiling pakete"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Hanap"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Humanap ng pakete"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Humanap ^Ulit"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Ulitin ang huling pag-hahanap"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Limitahan ang pag-papakita"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Apply ang filter sa listahan ng mga pakete"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Un-Limit Display"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Alisin ang filter sa mga listahan ng pakete"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Hanapin ang ^Basag"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^UI options"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Baguhin ang settings na maapektuhan ang user interface"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Dependency na pag-tagan"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Palitan ang settings na makaka apekto kung paano ang pakete dependencies ay "
 "hawakan"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Miscellaneous"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Palitan ang samut-samot na programa settings"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Mabalik ang options"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Ibalik ang lahat ng settings sa system default"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Susunod"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Pakita ang susunod na display"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^Nakaraan"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Pakita ang nakaraang display"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Isara"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Isara ang display"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "^Tanaw ng Bagong mga Pakete"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Gumawa ng bagong default pakete view"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Bagong Kategoryang ^Browser"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Silipin ang pakete ayon sa kategorya"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Tungkol"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Basahin ang impormasyon tungkol sa programang ito"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Tulong"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Basahin ang tulong na on-line"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Manwal ng Pag-gamit"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Basahin ang detalyadong manwal ng programa"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Basahin ang talaan ng madalas na tanungin"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Tignan ang mga mahalagang pagbabago sa bawat bersyon ng programa"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Lisensiya"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Basahin ang mga tadhana kung paano makokopya ang programa"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Mga Gagawin"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Paghahanap"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Mga Pagpipilian"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Mga Pananaw"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Tulong"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4605,11 +4609,11 @@
 msgstr ""
 "%s: Menu  %s: Tulong %s: Quit %s: Apdeyt  %s: Kumuha/Instol/Tanggal ng Pkt"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "o"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "h"
 
@@ -4680,7 +4684,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Aray!  Nakatanggap ng SIGQUIT, namamatay..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/tr.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/tr.po	(original)
+++ branches/aptitude-0.3/aptitude/po/tr.po	Wed Jul  6 22:10:50 2005
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2004-11-06 18:58+0200\n"
 "Last-Translator: Erçin EKER <ercin.eker at linux.org.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -926,66 +926,70 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Aşağıdaki paketler bağımlılıkları karşılamıyor:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Aşağıdaki paketler BOZUK:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "%s yazmak için açılamıyor"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Durum dosyası yazma hatası"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Yanlış cevap.  Lütfen geçerli bir komut girin ya da yardım için '?'.\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Yanlış cevap.  Lütfen geçerli bir komut girin ya da yardım için '?'.\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "Arama: En az bir arama terimi sağlamalısınız\n"
@@ -1286,7 +1290,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Liste klasörü temizlenemiyor"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "EskimiÅŸ indirilmiÅŸ dosyalar siliniyor"
 
@@ -2193,7 +2197,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Mayın tarlası"
 
@@ -2400,7 +2404,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Paket"
 
@@ -3994,45 +3998,45 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Sürümler"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Devam"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Paket kurulumu önizlemesi"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Yapılacak değişiklikleri görüntüle ve/veya değiştir"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "Ön^ceki"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Bazı paket bağımlılıkları kırıktı ve düzeltildi."
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Mayınları bulmaya çalışırken zamanı boşa harcayın"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4041,23 +4045,23 @@
 "Paket kurma/kaldırma işlemi şu anda sahip olmadığınız yönetici yetkilerini\n"
 "gerektirir.  Root kullanıcı hesabına geçmek ister misiniz?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Root ol"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Root olma"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Paket listesi güncellemesi veya kurulum işlemi zaten sürüyor."
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Hiçbir paket kurulmayacak, yükseltilmeyecek ya da kaldırılmayacak."
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4069,7 +4073,7 @@
 "Bazı paketler yükseltilebilir, ama onları yükseltmeyi seçmediniz.\n"
 "Yükseltme için \"U\" tuşuna basın."
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4078,114 +4082,114 @@
 "Paket listesi güncelleme işlemi şu anda sahip olmadığınız yönetici\n"
 "yetkilerini gerektirir.  Root kullanıcı hesabına geçmek ister misiniz?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Mayınları bulmaya çalışırken zamanı boşa harcayın"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "İndirme işlemi sürerken temizlemeye izin verilmez."
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Ä°ndirilmiÅŸ dosyalar siliniyor"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Ä°ndirilmiÅŸ paketler silindi."
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Ä°ndirilmiÅŸ eski paketler temizlendi."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Mayınları bulmaya çalışırken zamanı boşa harcayın"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "%s yazmak için açılamıyor"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Paketleri kur/kaldır"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Bekleyen tüm kurulum ve kaldırma işlemlerini gerçekleştirir"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "Paket listesini ^güncelle"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Paketleri yeni sürümleri için denetler"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "Yeni paketleri ^unut"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Yeni paketleri unutur"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "Paket ön^belleğini temizle"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Daha önce indirilmiş paket dosyalarını siler"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Eski d^osyaları temizle"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Artık indirilemeyecek olan (eski) paket dosyalarını siler"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "^Güncellenebilir işaretle"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 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/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "Mayın tarlası ^oyna"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "Root o^l"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4194,69 +4198,69 @@
 "Root olmak için 'su' komutunu çalıştır;  bu işlem programı yeniden\n"
 "başlatır ama ayarlarınız korunacak"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "Paket arabelleÄŸini ^yenile"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Paket önbelleğini yeniden yükle"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "Çı^k"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Programdan çıkar"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Geri al"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 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/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Kur"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Şu an seçili paketi kurma ya da yükseltme işlemi için işaretle"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Kaldır"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Şu an seçili paketi kaldırma işlemi için işaretle"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Temizle"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Seçili olan paketi ve yapılandırma dosyalarını kaldırma işlemi için işaretle"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Koru"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Seçili paket ile ilgili herhangi bir işlemi iptal et"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Tut"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4264,11 +4268,11 @@
 "Seçili paket ile ilgili herhangi bir işlemi iptal et ve daha sonra "
 "yapılacakyükseltmelerden koru"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "^Otom. Ä°ÅŸaretle"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4277,11 +4281,11 @@
 "Paketi otomatik kurulmuÅŸ olarak iÅŸaretle; daha sonra bu pakete\n"
 "bağımlı paket kalmazsa otomatik olarak kaldır"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Elle ^Ä°ÅŸaretle"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4290,11 +4294,11 @@
 "Paketi el ile kurulmuÅŸ olarak iÅŸaretle; siz silmek istemediÄŸiniz\n"
 "sürece kurulu kalacaktır"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "Sürümü ^Engelle"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4303,204 +4307,204 @@
 "Şu anda seçili paketin kurulacak sürümünün kurulumunu engelle;\n"
 "paketin daha yeni sürümleri alışıldık şekilde kurulacaktır"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "^Bilgi"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Seçilen paket hakkında daha detaylı bilgi göster"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Seçili paketin Debian değişiklik güncesini göster"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Bul"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Paket ara"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "^Tekrar Bul"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Son aramayı tekrarla"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "Görünümü ^Kısıtla"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Paket listesini filtrele"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "Görünümü Kısıtla^ma"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Paket listesine uygulanan filtreyi kaldır"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "^Bozukları Bul"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Paket bağımlılığı karşılanamayan sonraki paketi bul"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "^Arayüz seçenekleri"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Kullanıcı arayüzünü etkileyen ayarları değiştirir"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Bağımlılık işleme"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Paket bağımlılıklarının işlenmesini etkileyen ayarları değiştirir"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Çeşitli"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Programın çeşitli ayarlarını değiştirir"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Seçenekleri sıfırla"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Tüm ayarları sistem öntanımlı biçimlerine getirir"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Sonraki"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Sonraki ekranı görüntüle"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "Ön^ceki"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Önceki ekranı görüntüle"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Kapat"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Bu ekranı kapat"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Yeni paket gö^rünümü"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Yeni bir öntanımlı paket görünümü oluştur"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Yeni kategorik ^gezgin"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Paketlere kategoriye göre gözat"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Hakkında"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Bu program hakkındaki bilgileri görüntüler"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Yardım"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Çevrimiçi yardımı görüntüler"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "Kulla^nıcı Elkitabı"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Programın detaylı elkitabını görüntüler"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^SSS"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Sık sorulan soruların bir listesini görüntüler"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Programın her sürümünde yapılmış önemli değişiklikleri görüntüler"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Lisans"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Programı kopyalayabileceğiniz koşulları görüntüler"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Eylemler"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Ara"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Seçenekler"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Görünümler"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Yardım"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -4508,11 +4512,11 @@
 msgstr ""
 "%s: Menü  %s: Yardım  %s: Çık  %s: Güncelle  %s: Paketleri İndir/Kur/Kaldır"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "evet_anahtarı"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "anahtar_yok"
 
@@ -4583,7 +4587,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "SIGQUIT sinyali alındı, program kapanıyor..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/vi.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/vi.po	(original)
+++ branches/aptitude-0.3/aptitude/po/vi.po	Wed Jul  6 22:10:50 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.4.x\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-07-05 21:59+0930\n"
 "Last-Translator: Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -17,233 +17,233 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.2.2\n"
 
-#:src/apt_options.cc:109
+#: src/apt_options.cc:109
 msgid "Display some available commands at the top of the screen"
 msgstr "Hiển thị một số lệnh sẵn sàng tại đầu màn hình."
 
-#:src/apt_options.cc:111
+#: src/apt_options.cc:111
 msgid "Hide the menubar when it is not being used"
 msgstr "Ẩn thanh trình đơn khi không dùng nó."
 
-#:src/apt_options.cc:113
+#: src/apt_options.cc:113
 msgid "Use a minibuffer-style prompt when possible"
 msgstr "Dùng dấu nhắc kiểu đệm tí tị khi có thể"
 
-#:src/apt_options.cc:115
+#: src/apt_options.cc:115
 msgid "Show partial search results (incremental search)"
 msgstr "Hiển thị phần kết thúc tìm kiếm (tìm kiếm dần)."
 
-#:src/apt_options.cc:117
+#: src/apt_options.cc:117
 msgid "Closing the last view exits the program"
 msgstr "Khi đóng khung xem cuối cùng thì thoát khỏi chương trình."
 
-#:src/apt_options.cc:119
+#: src/apt_options.cc:119
 msgid "Prompt for confirmation at exit"
 msgstr "Nhắc với xác nhận khi thoát."
 
-#:src/apt_options.cc:121
+#: src/apt_options.cc:121
 msgid "Pause after downloading files"
 msgstr "Tạm dùng sau khi tải về tập tin."
 
-#:src/apt_options.cc:123
+#: src/apt_options.cc:123
 msgid "Never"
 msgstr "Không bao giờ"
 
-#:src/apt_options.cc:124
+#: src/apt_options.cc:124
 msgid "When an error occurs"
 msgstr "Khi gặp lỗi"
 
-#:src/apt_options.cc:125
+#: src/apt_options.cc:125
 msgid "Always"
 msgstr "Luôn luôn"
 
-#:src/apt_options.cc:127
+#: src/apt_options.cc:127
 msgid "Use a 'status-line' download indicator for all downloads"
 msgstr "Dùng bộ chỉ báo tải về «dòng trạng thái» mọi khi tải về."
 
-#:src/apt_options.cc:129
+#: src/apt_options.cc:129
 msgid "Display the extended description area by default"
 msgstr "Hiển thị vùng mô tả kéo dài theo mặc định."
 
-#:src/apt_options.cc:131
+#: src/apt_options.cc:131
 msgid "Advance to the next item after changing the state of a package"
 msgstr "Tiếp đến mục kế sau khi thay đổi trạng thái gói tin."
 
-#:src/apt_options.cc:133
+#: src/apt_options.cc:133
 msgid "Automatically show why packages are broken"
 msgstr "Tự động hiển thị lý do gói tin bị ngắt."
 
-#:src/apt_options.cc:135
+#: src/apt_options.cc:135
 msgid "The default grouping method for package views"
 msgstr "Phương pháp xếp nhóm mặc định cho khung xem gói tin."
 
-#:src/apt_options.cc:137
+#: src/apt_options.cc:137
 msgid "The default display-limit for package views"
 msgstr "Giới hạn hiển thị mặc định cho khung xem gói tin."
 
-#:src/apt_options.cc:139
+#: src/apt_options.cc:139
 msgid "The display format for package views"
 msgstr "Khuôn dạng hiển thị cho khung xem gói tin."
 
-#:src/apt_options.cc:142
+#: src/apt_options.cc:142
 msgid "The display format for the status line"
 msgstr "Khuôn dạng hiển thị cho dòng trạng thái."
 
-#:src/apt_options.cc:145
+#: src/apt_options.cc:145
 msgid "The display format for the header line"
 msgstr "Khuôn dạng hiển thị cho dòng đầu trang."
 
-#:src/apt_options.cc:154
+#: src/apt_options.cc:154
 msgid "Automatically upgrade installed packages"
 msgstr "Tự động cập nhật các gói đã cài đặt."
 
-#:src/apt_options.cc:156
+#: src/apt_options.cc:156
 msgid "Remove obsolete package files after downloading new package lists"
 msgstr "Loạị bỏ các tập tin gói cũ sau khi tải về danh sách gói mới."
 
-#:src/apt_options.cc:158
+#: src/apt_options.cc:158
 msgid "URL to use to download changelogs"
 msgstr "Tải về các bản ghi thay đổi (ChangeLog) qua địa chỉ Mạng này."
 
-#:src/apt_options.cc:161
+#: src/apt_options.cc:161
 msgid "Display a preview of what will be done before doing it"
 msgstr "Hiển thị khung xem việc trước khi làm việc ấy."
 
-#:src/apt_options.cc:164
+#: src/apt_options.cc:164
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Quên gói nào là «mới» mỗi khi cập nhật danh sách gói tin."
 
-#:src/apt_options.cc:167
+#: src/apt_options.cc:167
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Quên gói nào là «mới» mỗi khi cài đặt hay loại bỏ gói tin."
 
-#:src/apt_options.cc:170
+#: src/apt_options.cc:170
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Cảnh báo khi cố thực hiện việc có quyền chủ khi không phải đăng nhập với "
 "quyền chủ."
 
-#:src/apt_options.cc:173
+#: src/apt_options.cc:173
 msgid "File to log actions into"
 msgstr "Ghi các hành động vào tập tin này."
 
-#:src/apt_options.cc:180
+#: src/apt_options.cc:180
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Tự động quyết định gói đã chọn phụ thuộc vào gói khác nào."
 
-#:src/apt_options.cc:182
+#: src/apt_options.cc:182
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Tự động sửa gói bị ngắt trước khi cào đặt hay loại bỏ nó."
 
-#:src/apt_options.cc:184
+#: src/apt_options.cc:184
 msgid "Install Recommended packages automatically"
 msgstr "Tự động cài đặt các gói đã khuyến khích."
 
-#:src/apt_options.cc:186
+#: src/apt_options.cc:186
 msgid "Remove unused packages automatically"
 msgstr "Tự động loại bỏ các gói không dùng."
 
-#:src/apt_options.cc:188
+#: src/apt_options.cc:188
 msgid "Automatically remove unused packages matching this filter"
 msgstr "Tự động loại bỏ các gói không dùng mà khớp với bộ lọc này."
 
-#:src/apt_options.cc:240 src/mine/cmine.cc:271 src/mine/cmine.cc:334
-#:src/ui.cc:209 src/vscreen/vs_util.cc:78 src/vscreen/vs_util.cc:91
-#:src/vscreen/vs_util.cc:268 src/vscreen/vs_util.cc:304
+#: src/apt_options.cc:240 src/mine/cmine.cc:271 src/mine/cmine.cc:334
+#: src/ui.cc:209 src/vscreen/vs_util.cc:78 src/vscreen/vs_util.cc:91
+#: src/vscreen/vs_util.cc:268 src/vscreen/vs_util.cc:304
 msgid "Ok"
 msgstr "Được"
 
-#:src/apt_options.cc:241 src/download_list.cc:81 src/mine/cmine.cc:272
-#:src/mine/cmine.cc:335 src/vscreen/vs_util.cc:305
+#: src/apt_options.cc:241 src/download_list.cc:81 src/mine/cmine.cc:272
+#: src/mine/cmine.cc:335 src/vscreen/vs_util.cc:305
 msgid "Cancel"
 msgstr "Thôi"
 
-#:src/broken_indicator.cc:106 src/solution_dialog.cc:97
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
 msgid "Internal error: unexpected null solution."
 msgstr "Gặp lỗi nội bộ: giải pháp rỗng bất ngờ."
 
-#:src/broken_indicator.cc:158
+#: src/broken_indicator.cc:158
 msgid "Suggest "
 msgstr "Đệ nghị"
 
-#:src/broken_indicator.cc:164
-#,c-format
+#: src/broken_indicator.cc:164
+#, c-format
 msgid "%d installs"
 msgstr "%d lần cài"
 
-#:src/broken_indicator.cc:169
+#: src/broken_indicator.cc:169
 msgid "1 install"
 msgstr "1 lần cài"
 
-#:src/broken_indicator.cc:173
-#,c-format
+#: src/broken_indicator.cc:173
+#, c-format
 msgid "%d removals"
 msgstr "%d lần loại bỏ"
 
-#:src/broken_indicator.cc:178
+#: src/broken_indicator.cc:178
 msgid "1 removal"
 msgstr "1 lần loại bỏ"
 
-#:src/broken_indicator.cc:182
-#,c-format
+#: src/broken_indicator.cc:182
+#, c-format
 msgid "%d keeps"
 msgstr "%d lần giữ"
 
-#:src/broken_indicator.cc:187
+#: src/broken_indicator.cc:187
 msgid "1 keep"
 msgstr "1 lần giữ"
 
-#:src/broken_indicator.cc:191
-#,c-format
+#: src/broken_indicator.cc:191
+#, c-format
 msgid "%d upgrades"
 msgstr "%d lần nâng cấp"
 
-#:src/broken_indicator.cc:196
+#: src/broken_indicator.cc:196
 msgid "1 upgrade"
 msgstr "1 lần nâng cấp"
 
-#:src/broken_indicator.cc:200
-#,c-format
+#: src/broken_indicator.cc:200
+#, c-format
 msgid "%d downgrades"
 msgstr "%d lần hạ cấp"
 
-#:src/broken_indicator.cc:205
+#: src/broken_indicator.cc:205
 msgid "1 downgrade"
 msgstr "1 lần hạ cấp"
 
-#:src/broken_indicator.cc:214
-#,c-format
+#: src/broken_indicator.cc:214
+#, c-format
 msgid "%s: Examine"
 msgstr "%s: Khám xét"
 
-#:src/broken_indicator.cc:216
-#,c-format
+#: src/broken_indicator.cc:216
+#, c-format
 msgid "%s: Apply"
 msgstr "%s: Áp dụng"
 
-#:src/broken_indicator.cc:218
-#,c-format
+#: src/broken_indicator.cc:218
+#, c-format
 msgid "%s: Next"
 msgstr "%s: Kế"
 
-#:src/broken_indicator.cc:220
-#,c-format
+#: src/broken_indicator.cc:220
+#, c-format
 msgid "%s: Previous"
 msgstr "%s: TrÆ°á»›c"
 
-#:src/broken_indicator.cc:232
-#,c-format
+#: src/broken_indicator.cc:232
+#, c-format
 msgid "Solution search failed.  %s: try harder"
 msgstr "Tìm kiếm giải pháp thất bại. %s: cố tích cực hơn"
 
-#:src/broken_indicator.cc:237
+#: src/broken_indicator.cc:237
 msgid "Unable to resolve dependencies."
 msgstr "Không thể tháo gỡ cách phụ thuộc."
 
-#:src/cmdline/cmdline_action.cc:36
-#,c-format
+#: src/cmdline/cmdline_action.cc:36
+#, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
@@ -251,8 +251,8 @@
 "Ghi chú: «%s», nếu gói ảo\n"
 "      «%s», có phải được cài đặt rồi.\n"
 
-#:src/cmdline/cmdline_action.cc:43
-#,c-format
+#: src/cmdline/cmdline_action.cc:43
+#, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
@@ -260,8 +260,8 @@
 "Ghi chú: «%s», nếu gói ảo\n"
 "      «%s», có phải sẽ được cài đặt.\n"
 
-#:src/cmdline/cmdline_action.cc:61
-#,c-format
+#: src/cmdline/cmdline_action.cc:61
+#, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
 "real package and no package provides it.\n"
@@ -269,18 +269,18 @@
 "«%s» có phải trong cơ sở dữ liệu gói tin, nhưng mà\n"
 "nó không phải là gói thật và không có ai bảo quản nó.\n"
 
-#:src/cmdline/cmdline_action.cc:67
-#,c-format
+#: src/cmdline/cmdline_action.cc:67
+#, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "«%s» là gói ảo được cung cấp bởi:\n"
 
-#:src/cmdline/cmdline_action.cc:70
-#,c-format
+#: src/cmdline/cmdline_action.cc:70
+#, c-format
 msgid "You must choose one to install.\n"
 msgstr "Bạn phải chọn một gói cần cài.\n"
 
-#:src/cmdline/cmdline_action.cc:75
-#,c-format
+#: src/cmdline/cmdline_action.cc:75
+#, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
@@ -288,50 +288,50 @@
 "Ghi chú: sẽ lựa chọn «%s» thay thế\n"
 "      gói ảo «%s»\n"
 
-#:src/cmdline/cmdline_action.cc:93
-#,c-format
+#: src/cmdline/cmdline_action.cc:93
+#, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "Đã cài đặt «%s» phiên bản (%s) như yêu cầu rồi.\n"
 
-#:src/cmdline/cmdline_action.cc:99
-#,c-format
+#: src/cmdline/cmdline_action.cc:99
+#, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "Chưa cài đặt «%s» nên sẽ không cài lại nó.\n"
 
-#:src/cmdline/cmdline_action.cc:106 src/cmdline/cmdline_action.cc:112
-#,c-format
+#: src/cmdline/cmdline_action.cc:106 src/cmdline/cmdline_action.cc:112
+#, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Chưa cài đặt gói «%s» nên sẽ không loại bỏ nó.\n"
 
-#:src/cmdline/cmdline_action.cc:130
-#,c-format
+#: src/cmdline/cmdline_action.cc:130
+#, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Chưa cài đặt gói «%s» nên không thể cấm cập nhật.\n"
 
-#:src/cmdline/cmdline_action.cc:132
-#,c-format
+#: src/cmdline/cmdline_action.cc:132
+#, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Không thể cập nhật gói «%s» nên không thể cấm cập nhật.\n"
 
-#:src/cmdline/cmdline_action.cc:211
-#,c-format
+#: src/cmdline/cmdline_action.cc:211
+#, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Ghi chú: hiện thời lựa chọn gói «%s: %s» cần cài đặt.\n"
 
-#:src/cmdline/cmdline_action.cc:238
-#,c-format
+#: src/cmdline/cmdline_action.cc:238
+#, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 "Bạn chỉ có thể ghi rõ phiên bản gói khi sử dụng lệnh «install» (cài).\n"
 
-#:src/cmdline/cmdline_action.cc:244
-#,c-format
+#: src/cmdline/cmdline_action.cc:244
+#, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "Bạn chỉ có thể ghi rõ phiên bản kho gói khi sử dụng lệnh «install» (cài).\n"
 
-#:src/cmdline/cmdline_action.cc:278
-#,c-format
+#: src/cmdline/cmdline_action.cc:278
+#, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
 "packages contain \"%s\" in their name.\n"
@@ -339,8 +339,8 @@
 "Không tìm thấy gói «%s»,\n"
 "và hơn 40 gói có tên chứa «%s».\n"
 
-#:src/cmdline/cmdline_action.cc:281
-#,c-format
+#: src/cmdline/cmdline_action.cc:281
+#, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
 "packages contain \"%s\" in their name:\n"
@@ -348,13 +348,13 @@
 "Không tìm thấy gói «%s».\n"
 "Tuy nhiên, những gói theo đây có tên chứa «%s»:\n"
 
-#:src/cmdline/cmdline_action.cc:305
-#,c-format
+#: src/cmdline/cmdline_action.cc:305
+#, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Không tìm thấy gói này có tên hay mô tả khớp với «%s».\n"
 
-#:src/cmdline/cmdline_action.cc:307
-#,c-format
+#: src/cmdline/cmdline_action.cc:307
+#, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
 "packages contain \"%s\" in their description.\n"
@@ -362,8 +362,8 @@
 "Không tìm thấy gói khớp với «%s»,\n"
 "và hơn 40 gói có mô tả chứa «%s».\n"
 
-#:src/cmdline/cmdline_action.cc:310
-#,c-format
+#: src/cmdline/cmdline_action.cc:310
+#, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
 "packages contain \"%s\" in their description:\n"
@@ -371,78 +371,78 @@
 "Không tìm thấy gói khớp với «%s»,\n"
 "Tuy nhiên, những gói theo đây có mô tả chứa «%s».\n"
 
-#:src/cmdline/cmdline_action.cc:437
-#,c-format
+#: src/cmdline/cmdline_action.cc:437
+#, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Ký tự hành động sai «%c»\n"
 
-#:src/cmdline/cmdline_changelog.cc:28
+#: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Không thể thực hiện tiến trình «sensible-pager»: hệ thống này có kiểu Debian "
 "hoặt động phải không?"
 
-#:src/cmdline/cmdline_changelog.cc:71
-#,c-format
+#: src/cmdline/cmdline_changelog.cc:71
+#, c-format
 msgid "%s is not an official Debian package, cannot display its changelog."
 msgstr ""
 "%s không phải là gói Debian chính thức nên không thể hiển thị bản ghi các "
 "thay đổi nó."
 
-#:src/cmdline/cmdline_changelog.cc:79
-#,c-format
+#: src/cmdline/cmdline_changelog.cc:79
+#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Không tìm thấy bản ghi các thay đổi cho «%s»."
 
 # Variable: do not translate/ biến: đừng dịch
-#:src/cmdline/cmdline_clean.cc:52
-#,c-format
+#: src/cmdline/cmdline_clean.cc:52
+#, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Del %s* %spartial/*\n"
 
 # Variable: don't translate / Biến: đừng dịch
-#:src/cmdline/cmdline_clean.cc:80
-#,c-format
+#: src/cmdline/cmdline_clean.cc:80
+#, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Del %s %s [%sB]\n"
 
-#:src/cmdline/cmdline_clean.cc:136
-#,c-format
+#: src/cmdline/cmdline_clean.cc:136
+#, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Sẽ giải phóng %sB thêm chỗ trên đĩa.\n"
 
-#:src/cmdline/cmdline_clean.cc:139
-#,c-format
+#: src/cmdline/cmdline_clean.cc:139
+#, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Đã giải phóng %sB thêm chỗ trên đĩa.\n"
 
-#:src/cmdline/cmdline_do_action.cc:71
-#,c-format
+#: src/cmdline/cmdline_do_action.cc:71
+#, c-format
 msgid "Invalid operation %s"
 msgstr "Thao tác không hợp lệ «%s»."
 
-#:src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
-#:src/cmdline/cmdline_upgrade.cc:91
-#,c-format
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
+#, c-format
 msgid "Abort.\n"
 msgstr "Hủy bỏ.\n"
 
-#:src/cmdline/cmdline_download.cc:29
-#,c-format
+#: src/cmdline/cmdline_download.cc:29
+#, c-format
 msgid "download: you must specify at least one package to download\n"
 msgstr "tải về: bạn phải ghi rõ ít nhất một gói cần tải về.\n"
 
-#:src/cmdline/cmdline_download.cc:41 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Không thể đọc danh sách nguồn."
 
-#:src/cmdline/cmdline_download.cc:62
-#,c-format
+#: src/cmdline/cmdline_download.cc:62
+#, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Không tìm thấy gói có tên «%s»."
 
-#:src/cmdline/cmdline_download.cc:72
-#,c-format
+#: src/cmdline/cmdline_download.cc:72
+#, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
 "package?"
@@ -450,144 +450,144 @@
 "Không có tập tin có thể tải về cho trình %s phiên bản %s; có lẽ gói ấy là "
 "cục bộ hay cũ."
 
-#:src/cmdline/cmdline_forget_new.cc:43
-#,c-format
+#: src/cmdline/cmdline_forget_new.cc:43
+#, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Nên sẽ quên gói nào là mới.\n"
 
-#:src/cmdline/cmdline_moo.cc:16
-#,c-format
+#: src/cmdline/cmdline_moo.cc:16
+#, c-format
 msgid "There are no Easter Eggs in this program.\n"
 msgstr "Không có quả trứng Phục sinh trong chương trình này.\n"
 
-#:src/cmdline/cmdline_moo.cc:19
-#,c-format
+#: src/cmdline/cmdline_moo.cc:19
+#, c-format
 msgid "There really are no Easter Eggs in this program.\n"
 msgstr "Thật sự không có quả trứng Phục sinh nào trong chương trình này.\n"
 
-#:src/cmdline/cmdline_moo.cc:22
-#,c-format
+#: src/cmdline/cmdline_moo.cc:22
+#, c-format
 msgid ""
 "Didn't I already tell you that there are no Easter Eggs in this program?\n"
 msgstr ""
 "Tôi đã báo bạn biết không có quả trứng Phục sinh trong chương trình này phải "
 "không?\n"
 
-#:src/cmdline/cmdline_moo.cc:25
-#,c-format
+#: src/cmdline/cmdline_moo.cc:25
+#, c-format
 msgid "Stop it!\n"
 msgstr "Thôi đừng!\n"
 
-#:src/cmdline/cmdline_moo.cc:28
-#,c-format
+#: src/cmdline/cmdline_moo.cc:28
+#, c-format
 msgid "Okay, okay, if I give you an Easter Egg, will you go away?\n"
 msgstr "Bạn ạ, nếu tôi cho bạn một quả trứng Phục sinh thì bạn đi đâu không?\n"
 
-#:src/cmdline/cmdline_moo.cc:31
-#,c-format
+#: src/cmdline/cmdline_moo.cc:31
+#, c-format
 msgid "All right, you win.\n"
 msgstr "Bạn ạ, bạn thắng rồi.\n"
 
-#:src/cmdline/cmdline_moo.cc:40
-#,c-format
+#: src/cmdline/cmdline_moo.cc:40
+#, c-format
 msgid "Happy?"
 msgstr "Bạn có vui vẻ chưa?"
 
-#:src/cmdline/cmdline_moo.cc:44
-#,c-format
+#: src/cmdline/cmdline_moo.cc:44
+#, c-format
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Cái này là gì, hả bạn? Nó là một con voi do con rắn ăn, tất nhiên.\n"
 
-#:src/cmdline/cmdline_prompt.cc:46
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Không thể đọc danh sách nguồn."
 
-#:src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
+#, c-format
 msgid "but %s is to be installed."
 msgstr "nhưng mà %s cần cài."
 
-#:src/cmdline/cmdline_prompt.cc:224 src/cmdline/cmdline_show_broken.cc:76
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:224 src/cmdline/cmdline_show_broken.cc:76
+#, c-format
 msgid "but %s is installed and it is kept back."
 msgstr "nhưng mà đã cài đặt %s và sẽ giữ lại nó."
 
-#:src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
+#, c-format
 msgid "but %s is installed."
 msgstr "nhưng mà đã cai đặt %s rồi."
 
-#:src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
+#, c-format
 msgid "but it is not installable"
 msgstr "nhưng mà không thể càì nó."
 
-#:src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
+#, c-format
 msgid " which is a virtual package."
 msgstr " mà là gói ảo."
 
-#:src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
+#, c-format
 msgid " or"
 msgstr " hay"
 
-#:src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Theo đây có những gói bị HỎNG:"
 
-#:src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Theo đây có những gói không dùng nên sẽ bị LOẠI BỎ:"
 
-#:src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Theo đây có những gói đã giữ lại tự động:"
 
-#:src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Theo đây có những gói MỚI sẽ được cài tự động:"
 
-#:src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Theo đây có những gói sẽ bị LOẠI BỎ tự động:"
 
-#:src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Theo đây có những gói sẽ bị HẠ CẤP:"
 
-#:src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Theo đây có những gói đã giữ lại:"
 
-#:src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Theo đây có những gói sẽ được CÀI LẠI:"
 
-#:src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Theo đây có những gói MỚI sẽ được cài:"
 
-#:src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Theo đây có những gói sẽ bị LOẠI BỎ:"
 
-#:src/cmdline/cmdline_prompt.cc:260
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Theo đây có những gói sẽ được cập nhật:"
 
-#:src/cmdline/cmdline_prompt.cc:312
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:312
+#, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Theo đây có những gói CHỦ YẾU sẽ bị LOẠI BỎ:\n"
 
-#:src/cmdline/cmdline_prompt.cc:321
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:321
+#, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Theo đây có những gói CHỦ YẾU sẽ bị NGẮT bởi hành động này:\n"
 
-#:src/cmdline/cmdline_prompt.cc:331
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:331
+#, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
 "         Do NOT continue unless you know EXACTLY what you are doing!\n"
@@ -595,17 +595,17 @@
 "CẢNH BÁO: khi thực hiện hành động này thì rất có thể sẽ ngắt hệ thống bạn.\n"
 "ĐỪNG tiếp tục, trừ khi bạn biết làm như thế một cách CHÍNH XÁC.\n"
 
-#:src/cmdline/cmdline_prompt.cc:333
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Tôi hiểu rằng làm như thế là ý kiến xấu lắm."
 
-#:src/cmdline/cmdline_prompt.cc:336
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:336
+#, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Để tiếp tục thì hãy gõ cụm từ «%s»:\n"
 
-#:src/cmdline/cmdline_prompt.cc:375
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
 "\n"
@@ -620,120 +620,120 @@
 "Bạn chỉ nên tiếp tục cài nếu có chắc muốn làm như thế.\n"
 "\n"
 
-#:src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:166
-#:src/vscreen/vs_util.cc:204
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:166
+#: src/vscreen/vs_util.cc:204
 msgid "Yes"
 msgstr "Có"
 
-#:src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:167
-#:src/vscreen/vs_util.cc:205
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:167
+#: src/vscreen/vs_util.cc:205
 msgid "No"
 msgstr "Không"
 
-#:src/cmdline/cmdline_prompt.cc:388
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Bạn có muốn bỏ qua cảnh báo này và tiếp tục bằng mọi giá sao?\n"
 
-#:src/cmdline/cmdline_prompt.cc:389
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:389
+#, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Để tiếp tục thì hãy gõ «%s»; còn để hủy bỏ thì hãy gõ «%s»:"
 
-#:src/cmdline/cmdline_prompt.cc:400
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Không nhận biết dữ liệu gõ. Hãy gõ hoặc «%s» hoặc «%s».\n"
 
-#:src/cmdline/cmdline_prompt.cc:499
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:499
+#, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Theo đây có những gói đã KHUYẾN KHÍCH nhưng mà sẽ KHÔNG được cài:\n"
 
-#:src/cmdline/cmdline_prompt.cc:505
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:505
+#, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Theo đây có những gói đã ĐỀ NGHỊ nhưng mà sẽ KHÔNG được cài:\n"
 
-#:src/cmdline/cmdline_prompt.cc:510
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:510
+#, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Sẽ không cài, cập nhật hoặc loại bỏ gói nào.\n"
 
-#:src/cmdline/cmdline_prompt.cc:512
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:512
+#, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "Mới cập nhật %lu gói và cài đặt %lu lần thứ nhất rồi."
 
-#:src/cmdline/cmdline_prompt.cc:516
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:516
+#, c-format
 msgid "%lu reinstalled, "
 msgstr "Cài đặt lại %lu gói rồi."
 
-#:src/cmdline/cmdline_prompt.cc:518
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:518
+#, c-format
 msgid "%lu downgraded, "
 msgstr "Hạ cấp %lu gói rồi."
 
-#:src/cmdline/cmdline_prompt.cc:520
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:520
+#, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "Có %lu gói cần loại bỏ, và chưa cập nhật %lu gói.\n"
 
-#:src/cmdline/cmdline_prompt.cc:527
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:527
+#, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Cần phảỉ gọi %sB/%sB kho."
 
-#:src/cmdline/cmdline_prompt.cc:530
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:530
+#, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Cần phảỉ gọi %sB kho."
 
-#:src/cmdline/cmdline_prompt.cc:537
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:537
+#, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Sau khi giải nén thì sẽ dùng %sB.\n"
 
-#:src/cmdline/cmdline_prompt.cc:540
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:540
+#, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Sau khi giải nén thì sẽ giải phóng %sB thêm.\n"
 
-#:src/cmdline/cmdline_prompt.cc:578
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:578
+#, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Không có gói nào cần hiển thị: bạn hãy gõ các tên gói vào dòng sau 'i'.\n"
 
-#:src/cmdline/cmdline_prompt.cc:580
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Hãy bấm phím Return để tiếp tục."
 
-#:src/cmdline/cmdline_prompt.cc:606
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:606
+#, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Không tìm thấy gói nào: bạn hãy gõ các tên gói vào dòng sau 'c'.\n"
 
-#:src/cmdline/cmdline_prompt.cc:610
+#: src/cmdline/cmdline_prompt.cc:610
 msgid "Press Return to continue"
 msgstr "Hãy bấm phím Return để tiếp tục."
 
 # Variable: don't translate / Biến: đừng dịch
-#:src/cmdline/cmdline_prompt.cc:621
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:621
+#, c-format
 msgid "y: %Fn: %Fi: %Fc: %Fd: %Fs: %Fv: %Fe: %F%n%F%n%F%F%F%F%F%F%F%F"
 msgstr "y: %Fn: %Fi: %Fc: %Fd: %Fs: %Fv: %Fe: %F%n%F%n%F%F%F%F%F%F%F%F"
 
-#:src/cmdline/cmdline_prompt.cc:641
+#: src/cmdline/cmdline_prompt.cc:641
 msgid "continue with the installation"
 msgstr "tiếp tục cài đặt"
 
-#:src/cmdline/cmdline_prompt.cc:643
+#: src/cmdline/cmdline_prompt.cc:643
 msgid "abort and quit"
 msgstr "hủy bỏ rồi thoát"
 
-#:src/cmdline/cmdline_prompt.cc:645
+#: src/cmdline/cmdline_prompt.cc:645
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -741,7 +741,7 @@
 "hiển thị thông tin về một hay nhiều gói tin; tên các gói tin nên theo chữ "
 "«i»."
 
-#:src/cmdline/cmdline_prompt.cc:647
+#: src/cmdline/cmdline_prompt.cc:647
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -749,23 +749,23 @@
 "hiển thị bản ghi sửa đổi Debian của một hay nhiều gói tin; tên các gói tin "
 "nên theo chữ «c». "
 
-#:src/cmdline/cmdline_prompt.cc:649
+#: src/cmdline/cmdline_prompt.cc:649
 msgid "toggle the display of dependency information"
 msgstr "bật/tắt hiển thị thông tin cách phụ thuộc"
 
-#:src/cmdline/cmdline_prompt.cc:651
+#: src/cmdline/cmdline_prompt.cc:651
 msgid "toggle the display of changes in package sizes"
 msgstr "bật/tắt hiển thị thay đổi kích thước gói tin"
 
-#:src/cmdline/cmdline_prompt.cc:653
+#: src/cmdline/cmdline_prompt.cc:653
 msgid "toggle the display of version numbers"
 msgstr "bật/tắt hiển thị số thứ tự phiên bản"
 
-#:src/cmdline/cmdline_prompt.cc:655
+#: src/cmdline/cmdline_prompt.cc:655
 msgid "enter the full visual interface"
 msgstr "vào toàn giao diện trực quan"
 
-#:src/cmdline/cmdline_prompt.cc:656
+#: src/cmdline/cmdline_prompt.cc:656
 msgid ""
 "You may also specify modification to the actions which will be taken.  To do "
 "so, type an action character followed by one or more package names (or "
@@ -777,52 +777,52 @@
 "theo sau. Sẽ áp dụng hành động ấy vào mọi gói tin có trong danh sách ấy. Có "
 "thể sử dụng những hành động này:"
 
-#:src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
 msgid "'+' to install packages"
 msgstr "«+» (dấu cộng) để cài đặt gói tin"
 
-#:src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "«+M» để cài đặt gói tin và ngay đánh dấu mỗi điều đã được cài tự động"
 
-#:src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
 msgid "'-' to remove packages"
 msgstr "«-» (dấu trừ) để loại bỏ gói tin"
 
-#:src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
 msgid "'_' to purge packages"
 msgstr "«_» (dấu gạch dưới) để tẩy gói tin"
 
-#:src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
 msgid "'=' to place packages on hold"
 msgstr "«=» (dấu bằng) để giữ lại gói tin"
 
-#:src/cmdline/cmdline_prompt.cc:671 src/cmdline/cmdline_resolver.cc:130
+#: src/cmdline/cmdline_prompt.cc:671 src/cmdline/cmdline_resolver.cc:130
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "«:» (dấu hai chấm) giữ các gói tin ấy trong tính trạng hiện thời, không lập "
 "tính trạng «giữ lại»"
 
-#:src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
 msgid "'&M' to mark packages as automatically installed"
 msgstr "«&M» để đánh dấu mỗi gói tin đã được cài đặt tự động"
 
-#:src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
 msgid "'&m' to mark packages as manually installed"
 msgstr "«&m» để đánh dấu mỗi gói tin đã được cài đặt thủ công"
 
-#:src/cmdline/cmdline_prompt.cc:677
+#: src/cmdline/cmdline_prompt.cc:677
 msgid "Commands:"
 msgstr "Lệnh:"
 
-#:src/cmdline/cmdline_prompt.cc:732
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Bạn có muốn tiếp tục chứ? [Y/n : Có/không]"
 
-#:src/cmdline/cmdline_prompt.cc:757
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:757
+#, c-format
 msgid ""
 "\n"
 "Dependency information will be shown.\n"
@@ -832,8 +832,8 @@
 "Sẽ hiển thị thông tin về cách phụ thuộc.\n"
 "\n"
 
-#:src/cmdline/cmdline_prompt.cc:759
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:759
+#, c-format
 msgid ""
 "\n"
 "Dependency information will not be shown.\n"
@@ -843,8 +843,8 @@
 "Sẽ không hiển thị thông tin về cách phụ thuộc.\n"
 "\n"
 
-#:src/cmdline/cmdline_prompt.cc:765
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:765
+#, c-format
 msgid ""
 "\n"
 "Versions will be shown.\n"
@@ -854,8 +854,8 @@
 "Sẽ hiển thị số phiên bản.\n"
 "\n"
 
-#:src/cmdline/cmdline_prompt.cc:767
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:767
+#, c-format
 msgid ""
 "\n"
 "Versions will not be shown.\n"
@@ -865,8 +865,8 @@
 "Sẽ không hiển thị số phiên bản.\n"
 "\n"
 
-#:src/cmdline/cmdline_prompt.cc:772
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:772
+#, c-format
 msgid ""
 "\n"
 "Size changes will be shown.\n"
@@ -876,8 +876,8 @@
 "Sẽ hiển thị cách thay đổi cỡ.\n"
 "\n"
 
-#:src/cmdline/cmdline_prompt.cc:774
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:774
+#, c-format
 msgid ""
 "\n"
 "Size changes will not be shown.\n"
@@ -887,433 +887,437 @@
 "Sẽ không hiển thị cách thay đổi cỡ.\n"
 "\n"
 
-#:src/cmdline/cmdline_prompt.cc:797
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:797
+#, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Cách trả lời không hợp lệ. Hãy gõ lệnh hợp lệ hay lệnh «?» để xem trợ giúp.\n"
 
 # Variable: don't translate / Biến: đừng dịch
-#:src/cmdline/cmdline_resolver.cc:93
-#,c-format
+#: src/cmdline/cmdline_resolver.cc:93
+#, c-format
 msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 
-#:src/cmdline/cmdline_resolver.cc:108
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr "chấp nhận các thay đổi được đệ nghị"
 
-#:src/cmdline/cmdline_resolver.cc:110
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr "từ chối các thay đổi được đệ nghị, và tìm kiếm một giải pháp khác"
 
-#:src/cmdline/cmdline_resolver.cc:112
+#: src/cmdline/cmdline_resolver.cc:112
 msgid "give up and quit the program"
 msgstr "hủy bỏ rồi thoát khỏi chương trình"
 
-#:src/cmdline/cmdline_resolver.cc:114
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr "tiếp tục đến giải pháp kế"
 
-#:src/cmdline/cmdline_resolver.cc:116
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr "trở về giải pháp trước"
 
-#:src/cmdline/cmdline_resolver.cc:118
+#: src/cmdline/cmdline_resolver.cc:118
 msgid "adjust the state of the listed packages, where ACTION is one of:"
 msgstr ""
 "điều chỉnh tính trạng của các gói tin, mà HÀNH ĐỘNG là một điều của những "
 "điều theo đậy:"
 
-#:src/cmdline/cmdline_resolver.cc:136
+#: src/cmdline/cmdline_resolver.cc:136
 msgid ""
 "Adjustments will cause the current solution to be discarded and recalculated "
 "as necessary."
 msgstr ""
 "Điều chỉnh sẽ hủy bỏ giải pháp hiện thời, và tính lại nó khi cần thiết."
 
-#:src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "Theo đây có một số hành động sẽ tháo gỡ những cách phụ thuộc này:"
 
-#:src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 "Chấp nhận giải pháp này không? [Y] có, [n] không, [q] hỏi, [?] trợ giúp"
 
-#:src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Hiện thời hủy bỏ cố tháo gỡ những cách phục thuộc này."
 
-#:src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "Theo đây có những lệnh sẵn sàng hiện có:"
 
-#:src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "Ghi tính trạng tháo gỡ vào tập tin này:"
 
-#:src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
-#,c-format
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
+#, c-format
 msgid "Unable to open %s for writing"
 msgstr "Không thể mở %s để ghi."
 
-#:src/cmdline/cmdline_resolver.cc:245
-#,c-format
+#: src/cmdline/cmdline_resolver.cc:248
+#, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Gặp lỗi khi ghi tính trạng bộ tháo gỡ vào %s"
 
-#:src/cmdline/cmdline_resolver.cc:250
+#: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Đáp ứng không hợp lệ: hãy gõ một của những lệnh theo đây:"
 
-#:src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 "Không tìm giải pháp trong thời gian được gán. Cố tích cực hơn không? [Y] có, "
 "[n] không"
 
-#:src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Đáp ứng không hợp lệ: hãy gõ «y» (có) hay «n» (không)."
 
-#:src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Không thể tháo gỡ cách phụ thuộc. Hủy bỏ..."
 
-#:src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "Không có giải pháp nữa."
 
-#:src/cmdline/cmdline_search.cc:70
-#,c-format
+#: src/cmdline/cmdline_search.cc:72
+#, c-format
 msgid "iconv of %s failed.\n"
 msgstr "việc iconv «%s» bị lỗi.\n"
 
-#:src/cmdline/cmdline_search.cc:86
-#,c-format
+#: src/cmdline/cmdline_search.cc:88
+#, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "tìm kiếm: bạn phải gõ ít nhất một từ tìm kiếm.\n"
 
-#:src/cmdline/cmdline_show_broken.cc:113
-#,c-format
+#: src/cmdline/cmdline_show_broken.cc:113
+#, c-format
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Theo đây có một số gói phụ thuộc vào phần mềm chưa cài:\n"
 
-#:src/cmdline/cmdline_show.cc:120 src/cmdline/cmdline_show.cc:306
-#:src/solution_fragment.cc:65
+#: src/cmdline/cmdline_show.cc:120 src/cmdline/cmdline_show.cc:306
+#: src/solution_fragment.cc:65
 msgid "<NULL>"
 msgstr "<Rá»–NG>"
 
-#:src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:139
 msgid "not installed"
 msgstr "chưa cài đặt"
 
-#:src/cmdline/cmdline_show.cc:141 src/pkg_columnizer.cc:233
-#:src/pkg_ver_item.cc:225
+#: src/cmdline/cmdline_show.cc:141 src/pkg_columnizer.cc:233
+#: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "giải nén rồi"
 
-#:src/cmdline/cmdline_show.cc:143
+#: src/cmdline/cmdline_show.cc:143
 msgid "partially configured"
 msgstr "cấu hinh một cách bộ phân"
 
-#:src/cmdline/cmdline_show.cc:145
+#: src/cmdline/cmdline_show.cc:145
 msgid "partially installed"
 msgstr "cài một cách bộ phân"
 
-#:src/cmdline/cmdline_show.cc:147
+#: src/cmdline/cmdline_show.cc:147
 msgid "not installed (configuration files remain)"
 msgstr "chưa cài (các tập tin cấu hình còn lại)"
 
-#:src/cmdline/cmdline_show.cc:149 src/pkg_columnizer.cc:241
-#:src/pkg_ver_item.cc:233
+#: src/cmdline/cmdline_show.cc:149 src/pkg_columnizer.cc:241
+#: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "cài đặt rồi"
 
-#:src/cmdline/cmdline_show.cc:158
+#: src/cmdline/cmdline_show.cc:158
 msgid "not a real package"
 msgstr "không phải là gói thật"
 
-#:src/cmdline/cmdline_show.cc:171
+#: src/cmdline/cmdline_show.cc:171
 msgid " [held]"
 msgstr " [đã giữ lại]"
 
-#:src/cmdline/cmdline_show.cc:180
-#,c-format
+#: src/cmdline/cmdline_show.cc:180
+#, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; sẽ cài phiên bản %s"
 
-#:src/cmdline/cmdline_show.cc:184
-#,c-format
+#: src/cmdline/cmdline_show.cc:184
+#, c-format
 msgid "%s; version %s will be installed automatically"
 msgstr "%s; sẽ tự động cài phiên bản %s"
 
-#:src/cmdline/cmdline_show.cc:190 src/cmdline/cmdline_show.cc:205
-#,c-format
+#: src/cmdline/cmdline_show.cc:190 src/cmdline/cmdline_show.cc:205
+#, c-format
 msgid "%s; will be purged"
 msgstr "%s; sẽ bị tẩy"
 
-#:src/cmdline/cmdline_show.cc:203
-#,c-format
+#: src/cmdline/cmdline_show.cc:203
+#, c-format
 msgid "%s; will be purged because nothing depends on it"
 msgstr "%s; sẽ bị tẩy vì không có gì phụ thuộc vào nó."
 
-#:src/cmdline/cmdline_show.cc:210
-#,c-format
+#: src/cmdline/cmdline_show.cc:210
+#, c-format
 msgid "%s; will be removed because nothing depends on it"
 msgstr "%s; sẽ bị loại bỏ vì không có gì phụ thuộc vào nó"
 
-#:src/cmdline/cmdline_show.cc:212
-#,c-format
+#: src/cmdline/cmdline_show.cc:212
+#, c-format
 msgid "%s; will be removed"
 msgstr "%s; sẽ bị loại bỏ"
 
-#:src/cmdline/cmdline_show.cc:226
-#,c-format
+#: src/cmdline/cmdline_show.cc:226
+#, c-format
 msgid "%s%s; will be downgraded [%s -> %s]"
 msgstr "%s%s; sẽ bị hạ cấp [%s -> %s]"
 
-#:src/cmdline/cmdline_show.cc:229
-#,c-format
+#: src/cmdline/cmdline_show.cc:229
+#, c-format
 msgid "%s%s; will be upgraded [%s -> %s]"
 msgstr "%s%s; sẽ được cập nhật [%s -> %s]"
 
-#:src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:241 src/cmdline/cmdline_show.cc:262
 msgid "Package: "
 msgstr "Gói:"
 
-#:src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:270
-#:src/pkg_columnizer.cc:89
+#: src/cmdline/cmdline_show.cc:242 src/cmdline/cmdline_show.cc:270
+#: src/pkg_columnizer.cc:89
 msgid "State"
 msgstr "Tính trạng"
 
-#:src/cmdline/cmdline_show.cc:243 src/cmdline/cmdline_show.cc:326
+#: src/cmdline/cmdline_show.cc:243 src/cmdline/cmdline_show.cc:326
 msgid "Provided by"
 msgstr "Cung cấp bởi"
 
-#:src/cmdline/cmdline_show.cc:264 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:264 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Chủ yếu:"
 
-#:src/cmdline/cmdline_show.cc:264 src/cmdline/cmdline_show.cc:268
-#:src/cmdline/cmdline_show.cc:279 src/pkg_info_screen.cc:105
+#: src/cmdline/cmdline_show.cc:264 src/cmdline/cmdline_show.cc:268
+#: src/cmdline/cmdline_show.cc:279 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "có"
 
-#:src/cmdline/cmdline_show.cc:268
+#: src/cmdline/cmdline_show.cc:268
 msgid "New"
 msgstr "Má»›i"
 
-#:src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:273
 msgid "Forbidden version"
 msgstr "Phiên bản bị cấm"
 
-#:src/cmdline/cmdline_show.cc:277
+#: src/cmdline/cmdline_show.cc:277
 msgid "Automatically installed"
 msgstr "Tự động cài đặt"
 
-#:src/cmdline/cmdline_show.cc:279
+#: src/cmdline/cmdline_show.cc:279
 msgid "no"
 msgstr "không"
 
-#:src/cmdline/cmdline_show.cc:281
+#: src/cmdline/cmdline_show.cc:281
 msgid "Version: "
 msgstr "Phiên bản:"
 
-#:src/cmdline/cmdline_show.cc:282 src/pkg_info_screen.cc:113
+#: src/cmdline/cmdline_show.cc:282 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Ưu tiên:"
 
-#:src/cmdline/cmdline_show.cc:283 src/cmdline/cmdline_show.cc:285
-#:src/cmdline/cmdline_show.cc:294
+#: src/cmdline/cmdline_show.cc:283 src/cmdline/cmdline_show.cc:285
+#: src/cmdline/cmdline_show.cc:294
 msgid "N/A"
 msgstr "K0 có"
 
-#:src/cmdline/cmdline_show.cc:284 src/pkg_info_screen.cc:114
+#: src/cmdline/cmdline_show.cc:284 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Phần:"
 
-#:src/cmdline/cmdline_show.cc:286 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:286 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Bảo quản trị:"
 
-#:src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:289
 msgid "Uncompressed Size: "
 msgstr "Cỡ đã giải nén:"
 
-#:src/cmdline/cmdline_show.cc:293
+#: src/cmdline/cmdline_show.cc:293
 msgid "Architecture: "
 msgstr "Kiến trúc:"
 
-#:src/cmdline/cmdline_show.cc:295
+#: src/cmdline/cmdline_show.cc:295
 msgid "Compressed Size: "
 msgstr "Cỡ đã nén:"
 
-#:src/cmdline/cmdline_show.cc:297
+#: src/cmdline/cmdline_show.cc:297
 msgid "Filename: "
 msgstr "Tên tập tin:"
 
 # Do not translate/ đừng dịch
-#:src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:299
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#:src/cmdline/cmdline_show.cc:303 src/cmdline/cmdline_show.cc:306
+#: src/cmdline/cmdline_show.cc:303 src/cmdline/cmdline_show.cc:306
 msgid "Archive"
 msgstr "Kho"
 
-#:src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:311
 msgid "Depends"
 msgstr "Phụ thuộc "
 
-#:src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:313
 msgid "PreDepends"
 msgstr "Phụ thuộc trước"
 
-#:src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:315
 msgid "Recommends"
 msgstr "Khuyến khích"
 
-#:src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:317
 msgid "Suggests"
 msgstr "Đệ nghị"
 
-#:src/cmdline/cmdline_show.cc:319
+#: src/cmdline/cmdline_show.cc:319
 msgid "Conflicts"
 msgstr "Xung Ä‘á»™t"
 
-#:src/cmdline/cmdline_show.cc:321
+#: src/cmdline/cmdline_show.cc:321
 msgid "Replaces"
 msgstr "Thay thế"
 
-#:src/cmdline/cmdline_show.cc:323
+#: src/cmdline/cmdline_show.cc:323
 msgid "Obsoletes"
 msgstr "Làm cho cũ"
 
-#:src/cmdline/cmdline_show.cc:325
+#: src/cmdline/cmdline_show.cc:325
 msgid "Provides"
 msgstr "Cung cấp"
 
-#:src/cmdline/cmdline_show.cc:329 src/pkg_info_screen.cc:97
+#: src/cmdline/cmdline_show.cc:329 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Mô tả:"
 
-#:src/cmdline/cmdline_simulate.cc:37
-#,c-format
+#: src/cmdline/cmdline_simulate.cc:37
+#, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Sẽ tải về / cài / loại bỏ gói.\n"
 
-#:src/cmdline/cmdline_simulate.cc:48
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Gặp lỗi nội bộ vì chưa sắp xếp xong"
 
-#:src/cmdline/cmdline_update.cc:20
-#,c-format
+#: src/cmdline/cmdline_update.cc:20
+#, c-format
 msgid "E: The update command takes no arguments\n"
 msgstr "E: lệnh cập nhật không chấp nhận đối số\n"
 
-#:src/cmdline/cmdline_util.cc:69
-#,c-format
+#: src/cmdline/cmdline_util.cc:69
+#, c-format
 msgid "No candidate version found for %s\n"
 msgstr "Không tìm thấy phiên bản ứng cử cho %s\n"
 
-#:src/cmdline/cmdline_util.cc:83
-#,c-format
+#: src/cmdline/cmdline_util.cc:83
+#, c-format
 msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
 msgstr "Không tìm thấy kho «%s» cho gói «%s»\n"
 
-#:src/cmdline/cmdline_util.cc:93
-#,c-format
+#: src/cmdline/cmdline_util.cc:93
+#, c-format
 msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgstr "Không tìm thấy phiên bản «%s» cho gói «%s»\n"
 
-#:src/cmdline/cmdline_util.cc:99
-#,c-format
+#: src/cmdline/cmdline_util.cc:99
+#, c-format
 msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
 msgstr ""
-"Gặp lỗi nội bộ: giá trị không hợp lệ %i đưọc gởi cho «cmdline_find_ver» (dòng "
-"lệnh tìm phiên bản).\n"
+"Gặp lỗi nội bộ: giá trị không hợp lệ %i đưọc gởi cho "
+"«cmdline_find_ver» (dòng lệnh tìm phiên bản).\n"
 
-#:src/cmdline/cmdline_util.cc:129
-#,c-format
+#: src/cmdline/cmdline_util.cc:129
+#, c-format
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr "Không thể ghi rõ cả hai kho và phiên bản đều cho gói.\n"
 
-#:src/dep_item.cc:139
+#: src/dep_item.cc:139
 msgid "UNSATISFIED"
 msgstr "CÒN NGỜ"
 
-#:src/dep_item.cc:139 src/reason_fragment.cc:244
+#: src/dep_item.cc:139 src/reason_fragment.cc:244
 msgid "UNAVAILABLE"
 msgstr "KHÔNG CÓ"
 
-#:src/download_bar.cc:57 src/download_list.cc:279 src/download_screen.cc:67
-#,c-format
+#: src/download_bar.cc:57 src/download_list.cc:279 src/download_screen.cc:67
+#, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "Hãy nạp đĩa có nhãn «%s» vào ổ «%s»."
 
-#:src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Lần ghé"
 
-#:src/download_bar.cc:89
+#: src/download_bar.cc:89
 msgid "Downloading "
 msgstr "Tải về"
 
-#:src/download_bar.cc:102
+#: src/download_bar.cc:102
 msgid "Got "
 msgstr "Gọi rồi"
 
-#:src/download_bar.cc:156
+#: src/download_bar.cc:156
 msgid "Downloading..."
 msgstr "Tải về..."
 
-#:src/download.cc:93
+#: src/download.cc:93
 msgid "Couldn't read list of package sources"
 msgstr "Không thể đọc danh sách nguồn gói."
 
-#:src/download.cc:104 src/download.cc:322
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr ""
 "Không thể khóa thư mục danh sách...bạn có đăng nhập như là người chủ chưa?"
 
-#:src/download.cc:111
+#: src/download.cc:111
 msgid "Updating package lists"
 msgstr "Cập nhật danh sách gói..."
 
-#:src/download.cc:112
+#: src/download.cc:112
 msgid "View the progress of the package list update"
 msgstr "Xem tiến hành khi cập nhật danh sách gói"
 
-#:src/download.cc:113
+#: src/download.cc:113
 msgid "List Update"
 msgstr "Cập nhật danh sách"
 
-#:src/download.cc:160
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "Không thể xóa các thư mục danh sách."
 
-#:src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "Xóa bỏ các tập tin cũ đã tải về..."
 
-#:src/download.cc:182
-#,c-format
+#: src/download.cc:182
+#, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Xóa bỏ các tập tin cũ đã tải về...\n"
 
-#:src/download.cc:224
-#,c-format
+#: src/download.cc:224
+#, c-format
 msgid "Unable to open %s to log actions"
 msgstr "Không thể mở %s cần ghi lưu hành động."
 
-#:src/download.cc:230
+#: src/download.cc:230
 msgid "log report"
 msgstr "thông báo ghi lưu"
 
-#:src/download.cc:231
-#,c-format
+#: src/download.cc:231
+#, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
 "dpkg problems may not be completed.\n"
@@ -1322,80 +1326,80 @@
 "QUAN TRỌNG: bản ghi này chỉ liệt kê các hành động đã định; có lẽ sẽ không "
 "thực hiện xong các hành động không hoặt động vì gặp lỗi dpkg.\n"
 
-#:src/download.cc:232
-#,c-format
+#: src/download.cc:232
+#, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "Sẽ cài %li gói, và loại bỏ %li gói.\n"
 
-#:src/download.cc:234
-#,c-format
+#: src/download.cc:234
+#, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "Sẽ dùng %sB sức chứa đĩa.\n"
 
-#:src/download.cc:237
-#,c-format
+#: src/download.cc:237
+#, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "Sẽ giải phóng thêm %sB chỗ trống trên đĩa.\n"
 
-#:src/download.cc:245
-#,c-format
+#: src/download.cc:245
+#, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[CẬP NHẬT] %s %s -> %s\n"
 
-#:src/download.cc:249
-#,c-format
+#: src/download.cc:249
+#, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[HẠ CẤP] %s %s -> %s\n"
 
-#:src/download.cc:259
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "LOẠI BỎ"
 
-#:src/download.cc:265
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "CÀI"
 
-#:src/download.cc:268
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "CÀI LẠI"
 
-#:src/download.cc:271
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "GIỮ LẠI"
 
-#:src/download.cc:274
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "BỊ HỎNG"
 
-#:src/download.cc:277
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "LOẠI VÌ KHÔNG DÙNG"
 
-#:src/download.cc:280
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "LOẠI BỎ VI CÁCH PHỤ THUỘC"
 
-#:src/download.cc:283
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "CÀI VÌ CÁCH PHỤ THUỘC"
 
-#:src/download.cc:286
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "GIỮ LẠI VI CÁCH PHỤ THUỘC"
 
 # Do not translate/ đừng dịch
-#:src/download.cc:288
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
 # Variable: do not translate/ biến: đừng dịch
-#:src/download.cc:292
-#,c-format
+#: src/download.cc:292
+#, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#:src/download.cc:295
-#,c-format
+#: src/download.cc:295
+#, c-format
 msgid ""
 "===============================================================================\n"
 "\n"
@@ -1405,134 +1409,134 @@
 "\n"
 "Bản ghi hoàn tất.\n"
 
-#:src/download.cc:330
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "Tài về gói..."
 
-#:src/download.cc:331
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Xem cách tiến hành tải về gói."
 
-#:src/download.cc:332
+#: src/download.cc:332
 msgid "Package Download"
 msgstr "Tải gói tin về"
 
-#:src/download.cc:354
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Gặp lỗi nội bộ: không thể tạo ra danh sách các gói cần tải về."
 
-#:src/download.cc:415
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr "Không thể sửa với các gói không công bố."
 
-#:src/download.cc:467
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr "Aiie, có gì đó xấu trong khi cài gói. Thử phục hồi..."
 
-#:src/download.cc:477 src/pkg_item.cc:431
+#: src/download.cc:477 src/pkg_item.cc:431
 msgid "Press return to continue.\n"
 msgstr "Hãy bấm phím Return để tiếp tục.\n"
 
-#:src/download.cc:508
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
 "Không thể gọi lại khóa hệ thống. Có lẽ một trình apt hay dpkg khác có chạy "
 "không?)"
 
-#:src/download_item.cc:72 src/download_item.cc:76 src/download_item.cc:98
-#:src/generic/acqprogress.cc:236
-#,c-format
+#: src/download_item.cc:72 src/download_item.cc:76 src/download_item.cc:98
+#: src/generic/acqprogress.cc:236
+#, c-format
 msgid " [Working]"
 msgstr " [Hoạt động]"
 
-#:src/download_item.cc:102 src/download_list.cc:305
+#: src/download_item.cc:102 src/download_list.cc:305
 msgid "[Hit]"
 msgstr "[Lần ghé]"
 
-#:src/download_item.cc:102 src/download_list.cc:325
+#: src/download_item.cc:102 src/download_list.cc:325
 msgid "[Downloaded]"
 msgstr "[Tải về rồi]"
 
-#:src/download_list.cc:62
-#,c-format
+#: src/download_list.cc:62
+#, c-format
 msgid "Downloaded %sB in %s (%sB/s)."
 msgstr "Tải về %sB mất %s (%sB/s) rồi."
 
-#:src/download_list.cc:68
-#,c-format
+#: src/download_list.cc:68
+#, c-format
 msgid "%n%nSome files were not downloaded successfully."
 msgstr "%n%nChưa tải một số tập tin về được."
 
-#:src/download_list.cc:78 src/download_list.cc:286 src/download_screen.cc:75
+#: src/download_list.cc:78 src/download_list.cc:286 src/download_screen.cc:75
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#:src/download_list.cc:187 src/download_screen.cc:222
+#: src/download_list.cc:187 src/download_screen.cc:222
 msgid "Total Progress: "
 msgstr "Tổng tiến hành:"
 
-#:src/download_list.cc:206 src/download_screen.cc:237
-#,c-format
+#: src/download_list.cc:206 src/download_screen.cc:237
+#, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s còn lại)"
 
-#:src/download_list.cc:208
-#,c-format
+#: src/download_list.cc:208
+#, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (bị ngừng chạy)"
 
 # Variable: do not translate/ biến: đừng dịch
-#:src/download_list.cc:210
-#,c-format
+#: src/download_list.cc:210
+#, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#:src/download_list.cc:289 src/download_screen.cc:78
+#: src/download_list.cc:289 src/download_screen.cc:78
 msgid "Abort"
 msgstr "Hủy bỏ"
 
-#:src/download_list.cc:345
+#: src/download_list.cc:345
 msgid "[IGNORED]"
 msgstr "[BỊ BỎ QUA]"
 
-#:src/download_list.cc:351
+#: src/download_list.cc:351
 msgid "[ERROR]"
 msgstr "[Lá»–I]"
 
-#:src/download_screen.cc:199
-#,c-format
+#: src/download_screen.cc:199
+#, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Tải về %sB mất %ss (%sB/s) rồi."
 
-#:src/edit_pkg_hier.cc:179
+#: src/edit_pkg_hier.cc:179
 msgid "No hierarchy information to edit"
 msgstr "Không có thông tin cây nào cần sửa đổi."
 
-#:src/edit_pkg_hier.cc:279
+#: src/edit_pkg_hier.cc:279
 msgid "Couldn't open for writing"
 msgstr "Không thể mở để ghi."
 
-#:src/generic/acqprogress.cc:87
+#: src/generic/acqprogress.cc:87
 msgid "Get:"
 msgstr "Gọi:"
 
-#:src/generic/acqprogress.cc:118
+#: src/generic/acqprogress.cc:118
 msgid "Ign "
 msgstr "Bỏq"
 
-#:src/generic/acqprogress.cc:122
+#: src/generic/acqprogress.cc:122
 msgid "Err "
 msgstr "Lá»—i"
 
-#:src/generic/acqprogress.cc:142
-#,c-format
+#: src/generic/acqprogress.cc:142
+#, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Gọi %sB mất %s (%sB/s) rồi.\n"
 
-#:src/generic/acqprogress.cc:282
-#,c-format
+#: src/generic/acqprogress.cc:282
+#, c-format
 msgid ""
 "Media Change: Please insert the disc labeled '%s' in the drive '%s' and "
 "press enter\n"
@@ -1540,114 +1544,115 @@
 "Thay đổi phương tiện: hãy nạp đĩa có nhan «%s» vào ổ «%s» và bấm phím "
 "Enter.\n"
 
-#:src/generic/aptcache.cc:253
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "Không thể mở tập tin tính trạng kéo dài Aptitude."
 
-#:src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
-#:src/generic/aptcache.cc:315
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Đang đọc thông tin tính trạng kéo dài."
 
-#:src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
-#:src/generic/aptcache.cc:398
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Đang khởi động tính trạng của các gói."
 
-#:src/generic/aptcache.cc:509
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "Không thể mở tập tin tính trạng Aptitude."
 
-#:src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
-#:src/generic/aptcache.cc:571
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "Đang ghi thông tin tính trạng kéo dài."
 
-#:src/generic/aptcache.cc:550
-#,c-format
+#: src/generic/aptcache.cc:550
+#, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
-msgstr ""
-"Bộ đệm nội bộ bị tràn trên gói «%s» trong khi ghi tâp tin tính trạng."
+msgstr "Bộ đệm nội bộ bị tràn trên gói «%s» trong khi ghi tâp tin tính trạng."
 
-#:src/generic/aptcache.cc:559
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "Không thể ghi tâp tin tính trạng."
 
-#:src/generic/aptcache.cc:576
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "Gặp lỗi khi tâp tin tính trạng."
 
-#:src/generic/aptcache.cc:592
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "không thể thay thế tâp tin tính trạng cũ."
 
-#:src/generic/aptcache.cc:1000
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Không thể sửa cách phụ thuộc vì không thể cài một số gói."
 
-#:src/generic/aptcache.cc:1572
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Không thể đọc danh sách nguồn."
 
-#:src/generic/aptcache.cc:1579
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Không thể phân tách hay mở danh sách hay tâp tin trạng thái."
 
-#:src/generic/aptcache.cc:1582
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Có lẽ bạn muốn cập nhật danh sách gói để sửa trường hợp có những tập tin này "
 "còn thiếu."
 
-#:src/generic/apt.cc:152
-#,c-format
+#: src/generic/apt.cc:152
+#, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "Không thể thay thế %s bằng tập tin cấu hình mới."
 
-#:src/generic/apt.cc:227
+#: src/generic/apt.cc:227
 msgid ""
 "Could not lock the cache file.  Opening in read-only mode; any changes you "
 "make to the states of packages will NOT be preserved!"
-msgstr "Không thể khóa tập tin bộ nhớ tạm. Như thế thì sẽ mở nó trong chế độ chỉ-đọc: nếu bạn thay đổi tính trạng của gói tin nào, các thay đổi sẽ bị mất."
+msgstr ""
+"Không thể khóa tập tin bộ nhớ tạm. Như thế thì sẽ mở nó trong chế độ chỉ-"
+"đọc: nếu bạn thay đổi tính trạng của gói tin nào, các thay đổi sẽ bị mất."
 
-#:src/generic/matchers.cc:798
+#: src/generic/matchers.cc:798
 msgid "Unmatched '('"
 msgstr "Chưa khớp «(»"
 
-#:src/generic/matchers.cc:888 src/generic/matchers.cc:969
-#,c-format
+#: src/generic/matchers.cc:888 src/generic/matchers.cc:969
+#, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Không biết kiểu cách phụ thuộc: %s"
 
-#:src/generic/matchers.cc:951
-#,c-format
+#: src/generic/matchers.cc:951
+#, c-format
 msgid "Unknown action type: %s"
 msgstr "Không biểu kiểu hành động: %s"
 
-#:src/generic/matchers.cc:1018
-#,c-format
+#: src/generic/matchers.cc:1018
+#, c-format
 msgid "Unknown priority %s"
 msgstr "Không biết ưu tiên %s"
 
-#:src/generic/matchers.cc:1040
-#,c-format
+#: src/generic/matchers.cc:1040
+#, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Không biết kiểu mẫu: %c"
 
-#:src/generic/matchers.cc:1105
+#: src/generic/matchers.cc:1105
 msgid "Unexpected empty expression"
 msgstr "Biểu thức rỗng bất ngờ"
 
-#:src/generic/matchers.cc:1143
+#: src/generic/matchers.cc:1143
 msgid "Badly formed expression"
 msgstr "Biểu thức dạng sai"
 
-#:src/generic/matchers.cc:1175
+#: src/generic/matchers.cc:1175
 msgid "Unexpected ')'"
 msgstr "«)» bất ngờ"
 
-#:src/generic/pkg_acqfile.cc:86
-#,c-format
+#: src/generic/pkg_acqfile.cc:86
+#, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
@@ -1655,251 +1660,251 @@
 "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
 "này, do thiếu kiến trúc."
 
-#:src/generic/pkg_acqfile.cc:134
-#,c-format
+#: src/generic/pkg_acqfile.cc:134
+#, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Các tập tin mục lục của gói ấy bị hỏng. Không có trường Filename: (Tên tập "
 "tin:) cho gói %s."
 
-#:src/generic/pkg_changelog.cc:107
+#: src/generic/pkg_changelog.cc:107
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr ""
-"Không thể gói giá trị của «$HOME» (thư mục chính) dùng «TMPDIR» (thư mục tạm), cách không "
-"bảo mật."
+"Không thể gói giá trị của «$HOME» (thư mục chính) dùng «TMPDIR» (thư mục "
+"tạm), cách không bảo mật."
 
-#:src/generic/pkg_changelog.cc:149 src/view_changelog.cc:79
-#,c-format
+#: src/generic/pkg_changelog.cc:149 src/view_changelog.cc:79
+#, c-format
 msgid "ChangeLog of %s"
 msgstr "Bản ghi đổi của «%s»."
 
-#:src/generic/pkg_hier.cc:29 src/generic/pkg_hier.cc:50
-#,c-format
+#: src/generic/pkg_hier.cc:29 src/generic/pkg_hier.cc:50
+#, c-format
 msgid "Warning: group %s is involved in a cycle"
 msgstr "Cảnh báo: nhóm «%s» bị lặp."
 
-#:src/generic/pkg_hier.cc:144
-#,c-format
+#: src/generic/pkg_hier.cc:144
+#, c-format
 msgid "Cannot open package hierarchy file %s"
 msgstr "Không thể mở tập tin cây gói «%s»."
 
-#:src/generic/pkg_hier.cc:165
+#: src/generic/pkg_hier.cc:165
 msgid "Global block encountered after first record, ignoring"
 msgstr "Gặp khối toàn cục sau mục ghi thứ nhật nên bỏ qua nó."
 
-#:src/generic/pkg_hier.cc:178
+#: src/generic/pkg_hier.cc:178
 msgid "Bad record encountered (no Package or Group entry), skipping"
 msgstr "Gặp mục ghi sai (không có mục Gói hay Nhóm) nên bỏ qua nó."
 
-#:src/generic/pkg_hier.cc:180
-#,c-format
+#: src/generic/pkg_hier.cc:180
+#, c-format
 msgid "Bad record encountered (Package=%s, Group=%s), skipping"
 msgstr "Gặp mục ghi sai (Gói=%s, Nhóm+%s) nên bỏ qua nó."
 
-#:src/generic/pkg_hier.cc:243
-#,c-format
+#: src/generic/pkg_hier.cc:243
+#, c-format
 msgid "Multiple descriptions found for group %s, ignoring one"
 msgstr "Gặp nhiều mô tả cho nhóm %s nên bỏ qua một điều."
 
-#:src/generic/tasks.cc:295
+#: src/generic/tasks.cc:295
 msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
 msgstr "Không thể mở tập tin «/usr/share/tasksel/debian-tasks.desc»."
 
-#:src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346
+#: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346
 msgid "Reading task descriptions"
 msgstr "Đang đọc mô tả tác vụ."
 
-#:src/load_config.cc:44
-#,c-format
+#: src/load_config.cc:44
+#, c-format
 msgid "Unrecognized color name \"%s\""
 msgstr "Tên màu không nhận ra «%s»."
 
-#:src/load_config.cc:71
-#,c-format
+#: src/load_config.cc:71
+#, c-format
 msgid "Unrecognized attribute name \"%s\""
 msgstr "Tên thuộc tính không nhận ra «%s»."
 
-#:src/load_config.cc:109
-#,c-format
+#: src/load_config.cc:109
+#, c-format
 msgid "Invalid entry in style definition group: \"%s\""
 msgstr "Mục nhập không hợp lệ trong nhóm định nghĩa kiểu dạng: «%s»"
 
-#:src/load_config.cc:111
-#,c-format
+#: src/load_config.cc:111
+#, c-format
 msgid "Invalid tagless entry in style definition group: \"%s\""
 msgstr ""
 "Mục nhập không có thẻ không hợp lệ trong nhóm định nghĩa kiểu dạng: «%s»"
 
-#:src/load_config.cc:133
-#,c-format
+#: src/load_config.cc:133
+#, c-format
 msgid "Unknown style attribute %s"
 msgstr "Không biểu thuộc tính kiểu dạng: «%s»"
 
-#:src/load_config.cc:156 src/load_config.cc:158
-#,c-format
+#: src/load_config.cc:156 src/load_config.cc:158
+#, c-format
 msgid "Invalid entry in keybinding group: \"%s\""
 msgstr "Mục ghi không hợp lệ trong nhóm đóng kết phím: «%s»"
 
-#:src/load_config.cc:173
-#,c-format
+#: src/load_config.cc:173
+#, c-format
 msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
 msgstr "Bỏ qua điều đóng kết phím «%s» → «%s»"
 
-#:src/load_grouppolicy.cc:54
-#,c-format
+#: src/load_grouppolicy.cc:54
+#, c-format
 msgid "Bad section name '%s' (use 'none', 'topdir', or 'subdir')"
 msgstr ""
 "Tên phần sai «%s» — hãy dùng «none» (không có), «topdir» (thư mục đầu) hay "
 "«subdir» (thư mục con). "
 
-#:src/load_grouppolicy.cc:67
-#,c-format
+#: src/load_grouppolicy.cc:67
+#, c-format
 msgid "Bad passthrough setting '%s' (use 'passthrough' or 'nopassthrough')"
 msgstr ""
 "Cách thiết lập kiểu passthrough (đi qua) sai «%s» — hãy dùng "
 "«passthrough» (cho phép đi qua) hay «nopassthrough» (không cho phép đi qua)."
 
-#:src/load_grouppolicy.cc:75
+#: src/load_grouppolicy.cc:75
 msgid "Too many arguments to by-section grouping policy"
 msgstr "Quá nhiều đối số với chính sách nhóm lại theo phần."
 
-#:src/load_grouppolicy.cc:90
+#: src/load_grouppolicy.cc:90
 msgid "By-status grouping policies take no arguments"
 msgstr "Chính sách nhóm lại theo trạng thái không chấp nhận đối số."
 
-#:src/load_grouppolicy.cc:105
+#: src/load_grouppolicy.cc:105
 msgid ""
 "Exactly one filter name must be provided as an argument to a filter policy"
 msgstr "Phải cung cấp đúng một tên bộ lọc như là đối số với chính sách bộ lọc."
 
-#:src/load_grouppolicy.cc:118
-#,c-format
+#: src/load_grouppolicy.cc:118
+#, c-format
 msgid "Bad filter type '%s' (valid types are: 'missing')"
 msgstr "Kiểu bộ lọc sai «%s» — kiểu hợp lệ là «missing» (thiếu)"
 
-#:src/load_grouppolicy.cc:129
+#: src/load_grouppolicy.cc:129
 msgid "By-mode grouping policies take no arguments"
 msgstr "Chính sách nhóm lại theo chế độ không chấp nhận đối số."
 
-#:src/load_grouppolicy.cc:144
+#: src/load_grouppolicy.cc:144
 msgid "First-character grouping policies take no arguments"
 msgstr "Chính sách nhóm lại theo ký tự thứ nhất không chấp nhận đối số."
 
-#:src/load_grouppolicy.cc:159
+#: src/load_grouppolicy.cc:159
 msgid "Version-generating grouping policies take no arguments"
 msgstr "Chính sách nhóm lại tạo ra phiên bản không chấp nhận đối số."
 
-#:src/load_grouppolicy.cc:165
+#: src/load_grouppolicy.cc:165
 msgid "Version-generating grouping policies must be the tail of a chain"
 msgstr "Chính sách nhóm lại tạo ra phiên bản phải là cuối cùng của dây."
 
-#:src/load_grouppolicy.cc:177
+#: src/load_grouppolicy.cc:177
 msgid "Dep-generating grouping policies take no arguments"
 msgstr "Chính sách nhóm lại tạo ra cách phụ thuộc không chấp nhận đối số."
 
-#:src/load_grouppolicy.cc:183
+#: src/load_grouppolicy.cc:183
 msgid "Dep-generating grouping policies must be the tail of a chain"
 msgstr "Chính sách nhóm lại tạo ra cách phụ thuộc phải là cuối cùng của dây."
 
-#:src/load_grouppolicy.cc:195
+#: src/load_grouppolicy.cc:195
 msgid "By-priority grouping policies take no arguments"
 msgstr "Chính sách nhóm lại theo ưu tiên không chấp nhận đối số."
 
-#:src/load_grouppolicy.cc:230
+#: src/load_grouppolicy.cc:230
 msgid "Task grouping policies take no arguments"
 msgstr "Chính sách nhóm lại theo tác vụ không chấp nhận đối số."
 
-#:src/load_grouppolicy.cc:284
+#: src/load_grouppolicy.cc:284
 msgid "Invalid zero-length grouping policy name"
 msgstr "Tên chính sách nhóm lại có độ dài bằng không mà không hợp lệ."
 
-#:src/load_grouppolicy.cc:302
+#: src/load_grouppolicy.cc:302
 msgid "Unmatched '(' in grouping policy description"
 msgstr "Chưa khớp «(» trong mô tả chính sách nhóm lại."
 
-#:src/load_grouppolicy.cc:329
-#,c-format
+#: src/load_grouppolicy.cc:329
+#, c-format
 msgid "Invalid grouping policy type '%s'"
 msgstr "Kiểu chính sách nhóm lại không hợp lệ «%s»."
 
-#:src/load_pkgview.cc:58
+#: src/load_pkgview.cc:58
 msgid "Couldn't parse layout: No column format specified for static item"
 msgstr "Không thể phân tách bố trí: chưa ghi rõ dạng thức cột cho mục tĩnh."
 
-#:src/load_pkgview.cc:91
+#: src/load_pkgview.cc:91
 msgid "Couldn't parse layout: encoding error in column descriptor"
 msgstr "Không thể phân tách bố trí: gặp lỗi biên mã trong bô mô tả cột."
 
-#:src/load_pkgview.cc:112
-#,c-format
+#: src/load_pkgview.cc:112
+#, c-format
 msgid "Couldn't parse layout: unknown view item type \"%s\""
 msgstr "Không thể phân tách bố trí: không biết kiểu mục xem «%s»."
 
-#:src/load_pkgview.cc:119 src/load_pkgview.cc:127
+#: src/load_pkgview.cc:119 src/load_pkgview.cc:127
 msgid "Couldn't parse layout: no row number specified"
 msgstr "Không thể phân tách bố trí: chưa ghi rõ số hàng."
 
-#:src/load_pkgview.cc:135
+#: src/load_pkgview.cc:135
 msgid "Couldn't parse layout: no width specified"
 msgstr "Không thể phân tách bố trí: chưa ghi rõ độ rộng hàng."
 
-#:src/load_pkgview.cc:143
+#: src/load_pkgview.cc:143
 msgid "Couldn't parse layout: no height specified"
 msgstr "Không thể phân tách bố trí: chưa ghi rõ độ cao."
 
-#:src/load_pkgview.cc:174 src/load_pkgview.cc:192
-#,c-format
+#: src/load_pkgview.cc:174 src/load_pkgview.cc:192
+#, c-format
 msgid "Unknown alignment type '%s'"
 msgstr "Không biết kiểu canh lề «%s»."
 
-#:src/load_sortpolicy.cc:36
+#: src/load_sortpolicy.cc:36
 msgid "By-name sorting policies take no arguments"
 msgstr "Chính sách sắp xếp theo tên không chấp nhận đối số."
 
-#:src/load_sortpolicy.cc:49
+#: src/load_sortpolicy.cc:49
 msgid "By-installed size sorting policies take no arguments"
 msgstr "Chính sách sắp xếp theo cỡ sau cài không chấp nhận đối số."
 
-#:src/load_sortpolicy.cc:62
+#: src/load_sortpolicy.cc:62
 msgid "By-priority sorting policies take no arguments"
 msgstr "Chính sách sắp xếp theo ưu tiên không chấp nhận đối số."
 
-#:src/load_sortpolicy.cc:119
+#: src/load_sortpolicy.cc:119
 msgid "Invalid zero-length sorting policy name"
 msgstr "Tên chính sách sắp xếp theo độ dài bằng không mà không hợp lệ."
 
-#:src/load_sortpolicy.cc:137
+#: src/load_sortpolicy.cc:137
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Chưa khớp «(» trong mô tả chính xác sắp xếp."
 
-#:src/load_sortpolicy.cc:164
-#,c-format
+#: src/load_sortpolicy.cc:164
+#, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Kiểu chính sách sắp xếp không hợp lệ «%s»."
 
-#:src/main.cc:79
-#,c-format
+#: src/main.cc:79
+#, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Không thể giải mã chuỗi đa byte sau «%ls»."
 
-#:src/main.cc:88
-#,c-format
+#: src/main.cc:88
+#, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Không thể giải mã chuỗi ký tự rộng sau «%s»."
 
-#:src/main.cc:96
-#,c-format
+#: src/main.cc:96
+#, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "Đã biên dịch %s phiên bản %s vào ngày %s lúc %s\n"
 
-#:src/main.cc:99
-#,c-format
+#: src/main.cc:99
+#, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Trình biên dịch: g++ %s\n"
 
-#:src/main.cc:102
-#,c-format
+#: src/main.cc:102
+#, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
@@ -1907,8 +1912,8 @@
 "\n"
 "NCurses phiên bản: %s\n"
 
-#:src/main.cc:104
-#,c-format
+#: src/main.cc:104
+#, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
@@ -1916,23 +1921,23 @@
 "\n"
 "Curses phiên bản: %s\n"
 
-#:src/main.cc:106
-#,c-format
+#: src/main.cc:106
+#, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ phiên bản: %s\n"
 
-#:src/main.cc:112
-#,c-format
+#: src/main.cc:112
+#, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Cách sử dụng: aptitude [-S tên_tập_tin] [-u|-i]"
 
-#:src/main.cc:114
-#,c-format
+#: src/main.cc:114
+#, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [tùy_chọn] <hành_động> ..."
 
-#:src/main.cc:116
-#,c-format
+#: src/main.cc:116
+#, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
@@ -1941,142 +1946,142 @@
 "tÆ°Æ¡ng):\n"
 "\n"
 
-#:src/main.cc:117
-#,c-format
+#: src/main.cc:117
+#, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      • _cài_ / cập nhật gói\n"
 
-#:src/main.cc:118
-#,c-format
+#: src/main.cc:118
+#, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       • _Loại bỏ_ gói\n"
 
-#:src/main.cc:119
-#,c-format
+#: src/main.cc:119
+#, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        • Loại bỏ gói với các tập tin cấu hình (_tẩy_)\n"
 
-#:src/main.cc:120
-#,c-format
+#: src/main.cc:120
+#, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         • Giữ lại gói (_cầm_)\n"
 
-#:src/main.cc:121
-#,c-format
+#: src/main.cc:121
+#, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       • Thôi lệnh «giữ lại» cho gói ấy (_bỏ cầm)_\n"
 
-#:src/main.cc:122
-#,c-format
+#: src/main.cc:122
+#, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     • _Đánh dấu_ gói như là được cài đặt _tự động_\n"
 
-#:src/main.cc:123
-#,c-format
+#: src/main.cc:123
+#, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
-" unmarkauto   	• Đánh dấu gói như là được cài đặt thủ công (_bỏ dấu tự "
+" unmarkauto   \t• Đánh dấu gói như là được cài đặt thủ công (_bỏ dấu tự "
 "đông_)\n"
 
-#:src/main.cc:128
-#,c-format
+#: src/main.cc:128
+#, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
-" forbid-version 	• _Cấm_ trình aptitude cập nhật lên một _phiên bản_ gói nào "
-"đó.\n"
+" forbid-version \t• _Cấm_ trình aptitude cập nhật lên một _phiên bản_ gói "
+"nào đó.\n"
 
-#:src/main.cc:129
-#,c-format
+#: src/main.cc:129
+#, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       • Tải về danh sách gói mới / có thê _cập nhật_\n"
 
-#:src/main.cc:130
-#,c-format
+#: src/main.cc:130
+#, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      • _Cập nhật_ một cach an toàn\n"
 
-#:src/main.cc:131
-#,c-format
+#: src/main.cc:131
+#, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
-" dist-upgrade 	• _Cập nhật_, có thể sẽ cài và loại bỏ một số gói. (_phân "
+" dist-upgrade \t• _Cập nhật_, có thể sẽ cài và loại bỏ một số gói. (_phân "
 "phát_)\n"
 
-#:src/main.cc:132
-#,c-format
+#: src/main.cc:132
+#, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
-msgstr " forget-new   		• _Quên_ gói nào là _«mới»_\n"
+msgstr " forget-new   \t\t• _Quên_ gói nào là _«mới»_\n"
 
-#:src/main.cc:133
-#,c-format
+#: src/main.cc:133
+#, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       • _Tìm kiếm_ gói theo tên và/hay biểu thức\n"
 
-#:src/main.cc:134
-#,c-format
+#: src/main.cc:134
+#, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         • _Hiển thị_ thông tin chi tiết về gói\n"
 
-#:src/main.cc:135
-#,c-format
+#: src/main.cc:135
+#, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        • _Xóa_ bỏ mọi tập tin gói đã tải về\n"
 
-#:src/main.cc:136
-#,c-format
+#: src/main.cc:136
+#, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    • _Xóa_ bỏ mọi tập tin goi cũ đã tải về (_tự động_)\n"
 
-#:src/main.cc:137
-#,c-format
+#: src/main.cc:137
+#, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    • Xem _bản ghi các thay đổi_  gói\n"
 
-#:src/main.cc:138
-#,c-format
+#: src/main.cc:138
+#, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     • _Tải về_ tập tin loại .deb cho gói\n"
 
-#:src/main.cc:140
-#,c-format
+#: src/main.cc:140
+#, c-format
 msgid "  Options:\n"
 msgstr "  Tùy chọn:\n"
 
-#:src/main.cc:141
-#,c-format
+#: src/main.cc:141
+#, c-format
 msgid " -h             This help text\n"
 msgstr " -h             _Trợ giúp_ này\n"
 
-#:src/main.cc:142
-#,c-format
+#: src/main.cc:142
+#, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             _Giả cách_ hành động còn chưa thực hiện nó.\n"
 
-#:src/main.cc:143
-#,c-format
+#: src/main.cc:143
+#, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             Chỉ _tải về_ gói, chưa cài hay loại bỏ gì.\n"
 
-#:src/main.cc:144
-#,c-format
+#: src/main.cc:144
+#, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Luôn luôn _nhắc_ với sự xác nhận hay hành động\n"
 
-#:src/main.cc:145
-#,c-format
+#: src/main.cc:145
+#, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 " -y             Giả sử trả lời câu hỏi kiểu có / không đơn giản thì là Có "
 "(_yes_)\n"
 
-#:src/main.cc:146
-#,c-format
+#: src/main.cc:146
+#, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
@@ -2084,65 +2089,65 @@
 " -F format      Ghi rõ _dang thức_ hiển thị kết quả tìm kiếm; hãy xem tập "
 "tin hướng dẫn.\n"
 
-#:src/main.cc:147
-#,c-format
+#: src/main.cc:147
+#, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 " -O order       Ghi rõ cách sắp xếp kết quả tìm kiếm; hãy xem tập tin hướng "
 "dẫn (_thứ tự_).\n"
 
-#:src/main.cc:148
-#,c-format
+#: src/main.cc:148
+#, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w width       Ghi rõ _độ rộng_ hiển thị kết quả tìm kiếm\n"
 
-#:src/main.cc:149
-#,c-format
+#: src/main.cc:149
+#, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Cố gắng _sửa_ một cách năng nổ những gói bị ngắt.\n"
 
-#:src/main.cc:150
-#,c-format
+#: src/main.cc:150
+#, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Hiển thị _phiên bản_ nào sẽ được cài.\n"
 
-#:src/main.cc:151
-#,c-format
+#: src/main.cc:151
+#, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Hiển thị cách _phụ thuộc_ của mọi gói đa đổi tự động.\n"
 
-#:src/main.cc:152
-#,c-format
+#: src/main.cc:152
+#, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Hiển thị hiệu số cỡ gói sau khi cài đặt.\n"
 
-#:src/main.cc:153
-#,c-format
+#: src/main.cc:153
+#, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 " -v             Hiển thị thông tin thêm — có lẽ cung cấp nhiều lần (_chi "
 "tiết_)\n"
 
-#:src/main.cc:154
-#,c-format
+#: src/main.cc:154
+#, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [bản]   \tChọn phiên bản Debian nào nên cài gói.\n"
 
-#:src/main.cc:155
-#,c-format
+#: src/main.cc:155
+#, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o key=giá_trị      Lập một cách trực tiếp _tùy chọn_ cấu hình có tên phím "
 "(key)\n"
 
-#:src/main.cc:156
-#,c-format
+#: src/main.cc:156
+#, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
@@ -2150,491 +2155,492 @@
 " --with(out)-recommends\tGhi rõ có nên theo gói đề nghị (recommend) như là "
 "cách phụ thuộc quan trọng hay không (_(không) có đệ nghị_).\n"
 
-#:src/main.cc:157
-#,c-format
+#: src/main.cc:157
+#, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S tên_tập_tin: Đọc thông tin _trạng thái_ kéo dài aptitude từ tập tin ấy.\n"
 
-#:src/main.cc:158
-#,c-format
+#: src/main.cc:158
+#, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Tải về danh sách gói mới khi khởi động máy.\n"
 
-#:src/main.cc:159
-#,c-format
+#: src/main.cc:159
+#, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Chạy lệnh cài (_install_) khi khởi động máy.\n"
 
-#:src/main.cc:161
-#,c-format
+#: src/main.cc:161
+#, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 "                  Trình aptitude này không phải có tài năng của bò ma "
 "thuật.\n"
 
-#:src/main.cc:284
-#,c-format
+#: src/main.cc:284
+#, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o cần thiết đối số dạng «key=giá_trị», còn nhân %s (key=phím)"
 
-#:src/main.cc:323 src/main.cc:332
+#: src/main.cc:323 src/main.cc:332
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "LẠ: không biết mã tùy chọn đã nhận.\n"
 
-#:src/main.cc:341
+#: src/main.cc:341
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Có ghi rõ được chỉ một của hai tùy chọn «-u» và «-i».\n"
 
-#:src/main.cc:349
+#: src/main.cc:349
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
-"Không thể ghi rõ tùy chọn «-u» hay «-i» trong chế độ dòng lệnh (v.d. với lệnh "
-"'install' (càì))."
+"Không thể ghi rõ tùy chọn «-u» hay «-i» trong chế độ dòng lệnh (v.d. với "
+"lệnh 'install' (càì))."
 
-#:src/main.cc:370
+#: src/main.cc:370
 msgid "-u and -i may not be specified with a command"
 msgstr "Không thể ghi rõ tùy chọn «-u» hay «-i» với lệnh."
 
-#:src/main.cc:427
-#,c-format
+#: src/main.cc:427
+#, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Không biết lệnh «%s».\n"
 
-#:src/main.cc:434 src/main.cc:482
+#: src/main.cc:434 src/main.cc:482
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr "Gặp lỗi nội bộ: chưa bắt ngoại lệ «hết giải pháp».\n"
 
-#:src/main.cc:439 src/main.cc:487
+#: src/main.cc:439 src/main.cc:487
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr "Gặp lỗi nội bộ: chưa bắt ngoại lệ «hết thời gian».\n"
 
-#:src/main.cc:446
-#,c-format
+#: src/main.cc:446
+#, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "Cảnh báo: giao diện trực quan sẽ bỏ qua «-s/Cmdline::Simulate»\n"
 
-#:src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "Quét mìn"
 
-#:src/mine/cmine.cc:94
-#,c-format
+#: src/mine/cmine.cc:94
+#, c-format
 msgid "%i/%i mines  %d %s"
 msgstr "%i/%i mìn  %d %s"
 
-#:src/mine/cmine.cc:98 src/mine/cmine.cc:105
+#: src/mine/cmine.cc:98 src/mine/cmine.cc:105
 msgid "second"
 msgstr "giây"
 
-#:src/mine/cmine.cc:98 src/mine/cmine.cc:105
+#: src/mine/cmine.cc:98 src/mine/cmine.cc:105
 msgid "seconds"
 msgstr "giây"
 
-#:src/mine/cmine.cc:102
-#,c-format
+#: src/mine/cmine.cc:102
+#, c-format
 msgid "    %s in %d %s"
 msgstr "    %s trên %d %s"
 
-#:src/mine/cmine.cc:103
+#: src/mine/cmine.cc:103
 msgid "Won"
 msgstr "Thắng"
 
-#:src/mine/cmine.cc:103
+#: src/mine/cmine.cc:103
 msgid "Lost"
 msgstr "Thua"
 
-#:src/mine/cmine.cc:145 src/mine/cmine.cc:187
-#,c-format
+#: src/mine/cmine.cc:145 src/mine/cmine.cc:187
+#, c-format
 msgid "Could not open file \"%s\""
 msgstr "Không thể mở tập tin «%s»."
 
-#:src/mine/cmine.cc:160
-#,c-format
+#: src/mine/cmine.cc:160
+#, c-format
 msgid "Could not load game from %s"
 msgstr "Không thể tải trờ chơi từ «%s»."
 
-#:src/mine/cmine.cc:218
+#: src/mine/cmine.cc:218
 msgid "The board height must be a positive integer"
 msgstr "Độ cao bảng phải là số nguyên dương."
 
-#:src/mine/cmine.cc:230
+#: src/mine/cmine.cc:230
 msgid "The board width must be a positive integer"
 msgstr "Độ rộng bảng phải là số nguyên dương."
 
-#:src/mine/cmine.cc:242
+#: src/mine/cmine.cc:242
 msgid "Invalid mine count; please enter a positive integer"
 msgstr "Tổng số mìn không hợp lệ: hãy gõ một số nguyên dương."
 
-#:src/mine/cmine.cc:260
+#: src/mine/cmine.cc:260
 msgid "Setup custom game"
 msgstr "Thiết lập trò chơi tự chọn"
 
-#:src/mine/cmine.cc:262
+#: src/mine/cmine.cc:262
 msgid "Height of board: "
 msgstr "Độ cao bảng:"
 
-#:src/mine/cmine.cc:265
+#: src/mine/cmine.cc:265
 msgid "Width of board: "
 msgstr "Độ rộng bảng:"
 
-#:src/mine/cmine.cc:268
+#: src/mine/cmine.cc:268
 msgid "Number of mines: "
 msgstr "Số mìn:"
 
-#:src/mine/cmine.cc:327
+#: src/mine/cmine.cc:327
 msgid "Choose difficulty level"
 msgstr "Hãy chọn lớp khó"
 
-#:src/mine/cmine.cc:329
+#: src/mine/cmine.cc:329
 msgid "Easy"
 msgstr "Dá»…"
 
-#:src/mine/cmine.cc:330
+#: src/mine/cmine.cc:330
 msgid "Medium"
 msgstr "Giữa"
 
-#:src/mine/cmine.cc:331
+#: src/mine/cmine.cc:331
 msgid "Hard"
 msgstr "Khó"
 
-#:src/mine/cmine.cc:332
+#: src/mine/cmine.cc:332
 msgid "Custom"
 msgstr "Tự chọn"
 
-#:src/mine/cmine.cc:418
+#: src/mine/cmine.cc:418
 msgid "You have won."
 msgstr "Bạn thắng rồi."
 
-#:src/mine/cmine.cc:421
+#: src/mine/cmine.cc:421
 msgid "You lose!"
 msgstr "Bạn thua rồi."
 
-#:src/mine/cmine.cc:426
+#: src/mine/cmine.cc:426
 msgid "You die...  --More--"
 msgstr "Bạn chết... —Thêm—"
 
-#:src/mine/cmine.cc:439
+#: src/mine/cmine.cc:439
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Gai độc! Thuốc độc chết người...  —Thêm—"
 
-#:src/mine/cmine.cc:442
+#: src/mine/cmine.cc:442
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Bạn rơi vào các gai sắt sắc!  —Thêm—"
 
-#:src/mine/cmine.cc:445
+#: src/mine/cmine.cc:445
 msgid "You fall into a pit!  --More--"
 msgstr "Bạn rơi vào bẫy!  —Thêm—"
 
-#:src/mine/cmine.cc:448
+#: src/mine/cmine.cc:448
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "ĐÙNG!  Bạn giẫm lên mìn.  —Thêm—"
 
-#:src/mine/cmine.cc:453
+#: src/mine/cmine.cc:453
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Cái lao độc! Thuốc độc chết người...  —Thêm—"
 
-#:src/mine/cmine.cc:455
+#: src/mine/cmine.cc:455
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "Một cái lao nhỏ ném đến bạn! Bạn được đánh bởi cái lao nhỏ.  —Thêm—"
 
-#:src/mine/cmine.cc:459
+#: src/mine/cmine.cc:459
 msgid "You turn to stone... --More--"
 msgstr "Bạn trở thành đá.  —Thêm—"
 
-#:src/mine/cmine.cc:461
+#: src/mine/cmine.cc:461
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Sờ xác chết rắn thần là lỗi lầm tai hại.  —Thêm—"
 
-#:src/mine/cmine.cc:463
+#: src/mine/cmine.cc:463
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Ở đây bạn sờ một xác chết rắn thần.  —Thêm—"
 
-#:src/mine/cmine.cc:467
+#: src/mine/cmine.cc:467
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "Lách cách! Bạn nhả bẫy có đá to lớn lăn đến bạn! Nó đánh bạn! —Thêm—"
 
-#:src/mine/cmine.cc:477
+#: src/mine/cmine.cc:477
 msgid "sleep"
 msgstr "ngủ"
 
-#:src/mine/cmine.cc:480
+#: src/mine/cmine.cc:480
 msgid "striking"
 msgstr "có đánh"
 
-#:src/mine/cmine.cc:483
+#: src/mine/cmine.cc:483
 msgid "death"
 msgstr "sự chết"
 
-#:src/mine/cmine.cc:486
+#: src/mine/cmine.cc:486
 msgid "polymorph"
 msgstr "có thể đổi hình"
 
-#:src/mine/cmine.cc:489
+#: src/mine/cmine.cc:489
 msgid "magic missile"
 msgstr "vật ma thuật phóng ra"
 
-#:src/mine/cmine.cc:492
+#: src/mine/cmine.cc:492
 msgid "secret door detection"
 msgstr "phát hiện cửa bí mật"
 
-#:src/mine/cmine.cc:495
+#: src/mine/cmine.cc:495
 msgid "invisibility"
 msgstr "tính vô hình"
 
-#:src/mine/cmine.cc:498
+#: src/mine/cmine.cc:498
 msgid "cold"
 msgstr "lạnh"
 
-#:src/mine/cmine.cc:504
-#,c-format
+#: src/mine/cmine.cc:504
+#, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Đũa thần %s của bạn rã ra và nổ!  —Thêm—"
 
-#:src/mine/cmine.cc:510
+#: src/mine/cmine.cc:510
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Điện giật làm bạn xóc nảy lên!  —Thêm—"
 
-#:src/mine/cmine.cc:612
+#: src/mine/cmine.cc:612
 msgid "Enter the filename to load: "
 msgstr "Hãy gõ tên tập tin cần tải:"
 
-#:src/mine/cmine.cc:619
+#: src/mine/cmine.cc:619
 msgid "Enter the filename to save: "
 msgstr "Hãy gõ tên tập tin cần lưu:"
 
-#:src/mine/cmine.cc:629
+#: src/mine/cmine.cc:629
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
-#:src/mine/cmine.cc:631
+#: src/mine/cmine.cc:631
 msgid "Encoding of mine-help.txt|UTF-8"
 msgstr "UTF-8"
 
-#:src/pkg_columnizer.cc:83
+#: src/pkg_columnizer.cc:83
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#:src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "Gói"
 
-#:src/pkg_columnizer.cc:87
+#: src/pkg_columnizer.cc:87
 msgid "InstSz"
 msgstr "CỡCài"
 
-#:src/pkg_columnizer.cc:88
+#: src/pkg_columnizer.cc:88
 msgid "DebSz"
 msgstr "CỡDeb"
 
-#:src/pkg_columnizer.cc:90
+#: src/pkg_columnizer.cc:90
 msgid "Action"
 msgstr "Hành động"
 
-#:src/pkg_columnizer.cc:91
+#: src/pkg_columnizer.cc:91
 msgid "Description"
 msgstr "Mô tả"
 
-#:src/pkg_columnizer.cc:92
+#: src/pkg_columnizer.cc:92
 msgid "InstVer"
 msgstr "PhbCài"
 
-#:src/pkg_columnizer.cc:93
+#: src/pkg_columnizer.cc:93
 msgid "CandVer"
 msgstr "PhbƯng"
 
-#:src/pkg_columnizer.cc:94
+#: src/pkg_columnizer.cc:94
 msgid "LongState"
 msgstr "TrạngDài"
 
-#:src/pkg_columnizer.cc:95
+#: src/pkg_columnizer.cc:95
 msgid "LongAction"
 msgstr "HànhĐDài"
 
-#:src/pkg_columnizer.cc:96
+#: src/pkg_columnizer.cc:96
 msgid "Maintainer"
 msgstr "Bảo quản trị"
 
-#:src/pkg_columnizer.cc:97
+#: src/pkg_columnizer.cc:97
 msgid "Priority"
 msgstr "Ưu tiên"
 
-#:src/pkg_columnizer.cc:98
+#: src/pkg_columnizer.cc:98
 msgid "Section"
 msgstr "Phần"
 
-#:src/pkg_columnizer.cc:99
+#: src/pkg_columnizer.cc:99
 msgid "RC"
 msgstr "Giữ"
 
-#:src/pkg_columnizer.cc:100
+#: src/pkg_columnizer.cc:100
 msgid "Auto"
 msgstr "TựĐ"
 
-#:src/pkg_columnizer.cc:101
+#: src/pkg_columnizer.cc:101
 msgid "Tag"
 msgstr "Thẻ"
 
-#:src/pkg_columnizer.cc:104
+#: src/pkg_columnizer.cc:104
 msgid "ProgName"
 msgstr "TênChT"
 
-#:src/pkg_columnizer.cc:105
+#: src/pkg_columnizer.cc:105
 msgid "ProgVer"
 msgstr "PhBChT"
 
-#:src/pkg_columnizer.cc:106
+#: src/pkg_columnizer.cc:106
 msgid "#Broken"
 msgstr "#bị ngắt"
 
-#:src/pkg_columnizer.cc:107
+#: src/pkg_columnizer.cc:107
 msgid "DiskUsage"
 msgstr "ChỗĐĩa"
 
-#:src/pkg_columnizer.cc:108
+#: src/pkg_columnizer.cc:108
 msgid "DownloadSize"
 msgstr "CỡTảiVề"
 
-#:src/pkg_columnizer.cc:128 src/pkg_columnizer.cc:140 src/pkg_ver_item.cc:103
-#:src/pkg_ver_item.cc:168
+#: src/pkg_columnizer.cc:128 src/pkg_columnizer.cc:140 src/pkg_ver_item.cc:103
+#: src/pkg_ver_item.cc:168
 msgid "<N/A>"
 msgstr "<K0 có>"
 
-#:src/pkg_columnizer.cc:170 src/pkg_columnizer.cc:181
+#: src/pkg_columnizer.cc:170 src/pkg_columnizer.cc:181
 msgid "<none>"
 msgstr "<không>"
 
-#:src/pkg_columnizer.cc:221 src/pkg_grouppolicy.cc:224
+#: src/pkg_columnizer.cc:221 src/pkg_grouppolicy.cc:224
 msgid "virtual"
 msgstr "ảo"
 
-#:src/pkg_columnizer.cc:228 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
+#: src/pkg_columnizer.cc:228 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
 msgid "purged"
 msgstr "bị tẩy"
 
-#:src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:227
+#: src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:227
 msgid "half-config"
 msgstr "nửa cấu hình"
 
-#:src/pkg_columnizer.cc:237 src/pkg_ver_item.cc:229
+#: src/pkg_columnizer.cc:237 src/pkg_ver_item.cc:229
 msgid "half-install"
 msgstr "nửa cài"
 
-#:src/pkg_columnizer.cc:239 src/pkg_ver_item.cc:231
+#: src/pkg_columnizer.cc:239 src/pkg_ver_item.cc:231
 msgid "config-files"
 msgstr "tệp cấu hình"
 
-#:src/pkg_columnizer.cc:243 src/pkg_columnizer.cc:527 src/pkg_ver_item.cc:235
+#: src/pkg_columnizer.cc:243 src/pkg_columnizer.cc:527 src/pkg_ver_item.cc:235
 msgid "ERROR"
 msgstr "Lá»–I"
 
-#:src/pkg_columnizer.cc:290 src/pkg_ver_item.cc:293
+#: src/pkg_columnizer.cc:290 src/pkg_ver_item.cc:293
 msgid "hold"
 msgstr "giữ"
 
-#:src/pkg_columnizer.cc:293
+#: src/pkg_columnizer.cc:293
 msgid "forbidden upgrade"
 msgstr "nâng cấp bị cấm"
 
-#:src/pkg_columnizer.cc:295
+#: src/pkg_columnizer.cc:295
 msgid "purge"
 msgstr "tẩy"
 
-#:src/pkg_columnizer.cc:295 src/pkg_ver_item.cc:317
+#: src/pkg_columnizer.cc:295 src/pkg_ver_item.cc:317
 msgid "delete"
 msgstr "xóa bỏ"
 
-#:src/pkg_columnizer.cc:297 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
+#: src/pkg_columnizer.cc:297 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
 msgid "broken"
 msgstr "bị ngắt"
 
-#:src/pkg_columnizer.cc:299 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
-#:src/pkg_ver_item.cc:319
+#: src/pkg_columnizer.cc:299 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
+#: src/pkg_ver_item.cc:319
 msgid "install"
 msgstr "cài"
 
-#:src/pkg_columnizer.cc:301
+#: src/pkg_columnizer.cc:301
 msgid "reinstall"
 msgstr "cài lại"
 
-#:src/pkg_columnizer.cc:303
+#: src/pkg_columnizer.cc:303
 msgid "upgrade"
 msgstr "cập nhật"
 
-#:src/pkg_columnizer.cc:305 src/pkg_columnizer.cc:307 src/pkg_ver_item.cc:305
-#:src/pkg_ver_item.cc:312 src/pkg_ver_item.cc:321 src/pkg_ver_item.cc:324
+#: src/pkg_columnizer.cc:305 src/pkg_columnizer.cc:307 src/pkg_ver_item.cc:305
+#: src/pkg_ver_item.cc:312 src/pkg_ver_item.cc:321 src/pkg_ver_item.cc:324
 msgid "none"
 msgstr "k0 có"
 
-#:src/pkg_columnizer.cc:335 src/pkg_columnizer.cc:356
-#:src/pkg_columnizer.cc:363 src/pkg_grouppolicy.cc:218
-#:src/pkg_info_screen.cc:113 src/pkg_info_screen.cc:114
-#:src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:374
+#: src/pkg_columnizer.cc:335 src/pkg_columnizer.cc:356
+#: src/pkg_columnizer.cc:363 src/pkg_grouppolicy.cc:218
+#: src/pkg_info_screen.cc:113 src/pkg_info_screen.cc:114
+#: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:374
 msgid "Unknown"
 msgstr "Chưa biết"
 
-#:src/pkg_columnizer.cc:343 src/pkg_ver_item.cc:353
+#: src/pkg_columnizer.cc:343 src/pkg_ver_item.cc:353
 msgid "Imp"
 msgstr "Phải"
 
-#:src/pkg_columnizer.cc:345 src/pkg_ver_item.cc:355
+#: src/pkg_columnizer.cc:345 src/pkg_ver_item.cc:355
 msgid "Req"
 msgstr "Cần"
 
-#:src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:357
+#: src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:357
 msgid "Std"
 msgstr "Thg"
 
-#:src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:359
+#: src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:359
 msgid "Opt"
 msgstr "TCh"
 
-#:src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:361
+#: src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:361
 msgid "Xtr"
 msgstr "Nữa"
 
-#:src/pkg_columnizer.cc:353 src/pkg_ver_item.cc:363
+#: src/pkg_columnizer.cc:353 src/pkg_ver_item.cc:363
 msgid "ERR"
 msgstr "Lá»–I"
 
-#:src/pkg_columnizer.cc:375
-#,c-format
+#: src/pkg_columnizer.cc:375
+#, c-format
 msgid "#Broken: %ld"
 msgstr "#bị hỏng: %ld"
 
-#:src/pkg_columnizer.cc:390
-#,c-format
+#: src/pkg_columnizer.cc:390
+#, c-format
 msgid "Will use %sB of disk space"
 msgstr "Sẽ dùng %sB chỗ trên đĩa"
 
-#:src/pkg_columnizer.cc:398
-#,c-format
+#: src/pkg_columnizer.cc:398
+#, c-format
 msgid "Will free %sB of disk space"
 msgstr "Sẽ giải phóng %sB thêm chỗ trên đĩa"
 
-#:src/pkg_columnizer.cc:412
-#,c-format
+#: src/pkg_columnizer.cc:412
+#, c-format
 msgid "DL Size: %sB"
 msgstr "Cỡ tải về: %sB"
 
-#:src/pkg_columnizer.cc:482
+#: src/pkg_columnizer.cc:482
 msgid "HN too long"
 msgstr "Tên máy quá dài"
 
-#:src/pkg_columnizer.cc:651 src/pkg_columnizer.cc:660
-#,c-format
+#: src/pkg_columnizer.cc:651 src/pkg_columnizer.cc:660
+#, c-format
 msgid "Unable to transcode package display format after \"%ls\""
-msgstr "Không thể chuyển đổi bộ ký tự trong định dạng trình bày gói tin sau «%ls»."
+msgstr ""
+"Không thể chuyển đổi bộ ký tự trong định dạng trình bày gói tin sau «%ls»."
 
-#:src/pkg_columnizer.cc:667
+#: src/pkg_columnizer.cc:667
 msgid "Internal error: Default column string is unparsable"
 msgstr "Gặp lỗi nội bộ: không thể phân tách chuỗi cột mặc định."
 
-#:src/pkg_grouppolicy.cc:152
+#: src/pkg_grouppolicy.cc:152
 msgid ""
 "Packages which set up your computer to perform a particular task\n"
 " Packages in the 'Tasks' section contain no files; they merely depend upon "
@@ -2646,7 +2652,7 @@
 "gói khác. Những gói này cung cấp cách dễ dàng để lựa chọn một bộ đã định "
 "nghĩa trước cho một tác vụ đặc biệt."
 
-#:src/pkg_grouppolicy.cc:154
+#: src/pkg_grouppolicy.cc:154
 msgid ""
 "Packages with no declared section\n"
 " No section is given for these packages. Perhaps there is an error in the "
@@ -2656,7 +2662,7 @@
 "Chưa lập phần cho mỗi gói trong những gói này. Có lẽ gặp lỗi trong tập tin "
 "«Packages» (Gói tin) không?"
 
-#:src/pkg_grouppolicy.cc:156
+#: src/pkg_grouppolicy.cc:156
 msgid ""
 "Administrative utilities (install software, manage users, etc)\n"
 " Packages in the 'admin' section allow you to perform administrative tasks "
@@ -2668,7 +2674,7 @@
 "lý, v.d. cài đặt phần mềm, quản lý người dùng, định cấu hình và theo dõi hệ "
 "thống bạn, kiểm tra tải cho mạng."
 
-#:src/pkg_grouppolicy.cc:158
+#: src/pkg_grouppolicy.cc:158
 msgid ""
 "Packages converted from foreign formats (rpm, tgz, etc)\n"
 " Packages in the 'alien' section were created by the 'alien' program from a "
@@ -2678,7 +2684,7 @@
 "Gói tin trong phần «lạ» (alien) thì được tạo bởi chương trình «alien» từ "
 "khuôn dạng gói tin không phải là Debian, như RPM."
 
-#:src/pkg_grouppolicy.cc:159
+#: src/pkg_grouppolicy.cc:159
 msgid ""
 "The Debian base system\n"
 " Packages in the 'base' section are part of the initial system installation."
@@ -2686,7 +2692,7 @@
 "Hệ thống cơ bản Debian.\n"
 "Gói tin trong phần «cơ bản» (base) thì là phần bản cài đặt hệ thống ban đầu."
 
-#:src/pkg_grouppolicy.cc:160
+#: src/pkg_grouppolicy.cc:160
 msgid ""
 "Programs for faxmodems and other communications devices\n"
 " Packages in the 'comm' section are used to control modems and other "
@@ -2704,7 +2710,7 @@
 "phần mềm điều khiển điện thoại di động, giao diện FidoNet, và chạy hệ thộng "
 "bảng công báo (BBS)."
 
-#:src/pkg_grouppolicy.cc:161
+#: src/pkg_grouppolicy.cc:161
 msgid ""
 "Utilities and programs for software development\n"
 " Packages in the 'devel' section are used to write new software and work on "
@@ -2723,7 +2729,7 @@
 "trình viên, công cụ xử lý mã nguồn, và trình khác liên quan đến sự phát "
 "triển phần mềm."
 
-#:src/pkg_grouppolicy.cc:162
+#: src/pkg_grouppolicy.cc:162
 msgid ""
 "Documentation and specialized programs for viewing documentation\n"
 " Packages in the 'doc' section document parts of the Debian system, or are "
@@ -2733,7 +2739,7 @@
 "Gói tin trong phần «tài liệu» (doc.) chứa thông tin về các phần hệ thống "
 "Debian, hay là bộ xem khuôn dạng tài liệu."
 
-#:src/pkg_grouppolicy.cc:163
+#: src/pkg_grouppolicy.cc:163
 msgid ""
 "Text editors and word processors\n"
 " Packages in the 'editors' section allow you to edit plain ASCII text. These "
@@ -2745,7 +2751,7 @@
 "bản ASCII: «nhập thô». Chỉ một số gói tin này là trình xử lý văn bản trực "
 "quan."
 
-#:src/pkg_grouppolicy.cc:164
+#: src/pkg_grouppolicy.cc:164
 msgid ""
 "Programs for working with circuits and electronics\n"
 " Packages in the 'electronics' section include circuit design tools, "
@@ -2756,7 +2762,7 @@
 "điện, trình mô phỏng và trình dịch mã số cho bộ vi điều khiển, và phần mềm "
 "liên quan khác."
 
-#:src/pkg_grouppolicy.cc:165
+#: src/pkg_grouppolicy.cc:165
 msgid ""
 "Programs for embedded systems\n"
 " Packages in the 'embedded' section are meant to run on embedded devices. "
@@ -2768,7 +2774,7 @@
 "bị nhúng là thiết bị phần cứng đặc biệt có ít sức mạnh hơn máy vi tính bình "
 "thường: v.d. máy trên tay, điện thoại di động, và Tivo."
 
-#:src/pkg_grouppolicy.cc:166
+#: src/pkg_grouppolicy.cc:166
 msgid ""
 "The GNOME Desktop System\n"
 " GNOME is a collection of software which provides an easy-to-use desktop "
@@ -2780,7 +2786,7 @@
 "hành Linux. Gói tin trong phần «gnome» thuộc về môi trường GNOME hoặc hợp "
 "nhất chặt chẽ với nó."
 
-#:src/pkg_grouppolicy.cc:167
+#: src/pkg_grouppolicy.cc:167
 msgid ""
 "Games, toys, and fun programs\n"
 " Packages in the 'games' section are meant primarily for entertainment."
@@ -2788,7 +2794,7 @@
 "Trò chơi, đồ chơi và chương trình vui thú\n"
 "Gói tin trong phần «trò chơi» (games) được cấu tạo chính cho giải trí."
 
-#:src/pkg_grouppolicy.cc:168
+#: src/pkg_grouppolicy.cc:168
 msgid ""
 "Utilities to create, view, and edit graphics files\n"
 " Packages in the 'graphics' section include viewers for image files, image "
@@ -2802,7 +2808,7 @@
 "thẻ ảnh động, máy quét và cái máy ảnh số), và công cụ lập trình để quản lý "
 "đồ họa."
 
-#:src/pkg_grouppolicy.cc:169
+#: src/pkg_grouppolicy.cc:169
 msgid ""
 "Software for ham radio operators\n"
 " Packages in the 'hamradio' section are meant primarily for ham radio "
@@ -2812,7 +2818,7 @@
 "Gói tin trong phần «rađiô nghiệp dư» (ham radio) được cấu tạo chính cho "
 "người thao tác rađiô nghiệp dư."
 
-#:src/pkg_grouppolicy.cc:170
+#: src/pkg_grouppolicy.cc:170
 msgid ""
 "Interpreters for interpreted languages\n"
 " Packages in the 'interpreters' section include interpreters for languages "
@@ -2822,7 +2828,7 @@
 "Gói tin trong phần «trình dịch» (interpreters) thì bao gồm trình dịch cho "
 "ngôn ngữ như Python, Perl va Ruby, và cũng có thư viên cho ngôn ngữ ấy."
 
-#:src/pkg_grouppolicy.cc:171
+#: src/pkg_grouppolicy.cc:171
 msgid ""
 "The KDE Desktop System\n"
 " KDE is a collection of software which provides an easy-to-use desktop "
@@ -2834,7 +2840,7 @@
 "hành Linux. Gói tin trong phần «kde» thuộc về môi trường KDE hoặc hợp nhất "
 "chặt chẽ với nó."
 
-#:src/pkg_grouppolicy.cc:172
+#: src/pkg_grouppolicy.cc:172
 msgid ""
 "Development files for libraries\n"
 " Packages in the 'libdevel' section contain files required for building "
@@ -2847,7 +2853,7 @@
 "viên» (libs). Bạn không cần gói tin nào từ phần này, trừ khi bạn muốn tự "
 "biên dịch phần mềm."
 
-#:src/pkg_grouppolicy.cc:173
+#: src/pkg_grouppolicy.cc:173
 msgid ""
 "Collections of software routines\n"
 " Packages in the 'libs' section provide necessary functionality for other "
@@ -2861,7 +2867,7 @@
 "từ phần này; hệ thống quản lý gói tin sẽ cài gói tin nào cần thiết bởi phần "
 "mềm khác phụ thuộc vào nó."
 
-#:src/pkg_grouppolicy.cc:174
+#: src/pkg_grouppolicy.cc:174
 msgid ""
 "Perl interpreter and libraries\n"
 " Packages in the 'perl' section provide the Perl programming language and "
@@ -2874,7 +2880,7 @@
 "viên nhóm ba cho nó. Chỉ lập trình viên Perl cần cài riêng rẽ gói tin nào; "
 "trình quản lý gói tin sẽ cài gói nào cần thiết."
 
-#:src/pkg_grouppolicy.cc:175
+#: src/pkg_grouppolicy.cc:175
 msgid ""
 "Python interpreter and libraries\n"
 " Packages in the 'python' section provide the Python programming language "
@@ -2887,7 +2893,7 @@
 "thư viên nhóm ba cho nó. Chỉ lập trình viên Python cần cài riêng rẽ gói tin "
 "nào; trình quản lý gói tin sẽ cài gói nào cần thiết."
 
-#:src/pkg_grouppolicy.cc:176
+#: src/pkg_grouppolicy.cc:176
 msgid ""
 "Programs to write, send, and route email messages\n"
 " Packages in the 'mail' section include mail readers, mail transport "
@@ -2899,7 +2905,7 @@
 "tải thư, phần mềm hộp thư chung, bộ lọc thư rác, và phần mềm khác liên quan "
 "đến thư điện tử."
 
-#:src/pkg_grouppolicy.cc:177
+#: src/pkg_grouppolicy.cc:177
 msgid ""
 "Numeric analysis and other mathematics-related software\n"
 " Packages in the 'math' section include calculators, languages for "
@@ -2911,7 +2917,7 @@
 "toán (như Mathematica), gói tin đại số tượng trưng, và chương trình hiển thị "
 "đối tượng toán."
 
-#:src/pkg_grouppolicy.cc:178
+#: src/pkg_grouppolicy.cc:178
 msgid ""
 "Miscellaneous software\n"
 " Packages in the 'misc' section have too unusual a function to be classified."
@@ -2919,7 +2925,7 @@
 "Phần mềm khác\n"
 "Gói tin trong phần «lặt vặt» (misc.) không khớp với nhóm nào."
 
-#:src/pkg_grouppolicy.cc:179
+#: src/pkg_grouppolicy.cc:179
 msgid ""
 "Programs to connect to and provide various services\n"
 " Packages in the 'net' section include clients and servers for many "
@@ -2932,7 +2938,7 @@
 "giao thức mạng bậc thấp, hệ thống tin nhắn tức khắc, và phần mềm khác liên "
 "quan đến mạng."
 
-#:src/pkg_grouppolicy.cc:180
+#: src/pkg_grouppolicy.cc:180
 msgid ""
 "Usenet clients and servers\n"
 " Packages in the 'news' section are related to the Usenet distributed news "
@@ -2942,7 +2948,7 @@
 "Gói tin trong «tin tức» (news) thi liên quan đến hệ thống tin tức phân tán "
 "Usenet. Bao gồm trình đọc tin tức và trình cung cấp tin tức."
 
-#:src/pkg_grouppolicy.cc:181
+#: src/pkg_grouppolicy.cc:181
 msgid ""
 "Obsolete libraries\n"
 " Packages in the 'oldlibs' section are obsolete and should not be used by "
@@ -2961,7 +2967,7 @@
 "Rất ít có bạn cần cài gói tin nào từ phần này; trinh quản lý gói tin sẽ cài "
 "mọi gói tin cần thiết."
 
-#:src/pkg_grouppolicy.cc:182
+#: src/pkg_grouppolicy.cc:182
 msgid ""
 "Emulators and software to read foreign filesystems\n"
 " Packages in the 'otherosfs' section emulate hardware and operating systems "
@@ -2980,7 +2986,7 @@
 "\n"
 "• Ghi chú: phần mềm chép ra đĩa CD có trong phần này. •"
 
-#:src/pkg_grouppolicy.cc:183
+#: src/pkg_grouppolicy.cc:183
 msgid ""
 "Software for scientific work\n"
 " Packages in the 'science' section include tools for astronomy, biology, and "
@@ -2990,7 +2996,7 @@
 "Gói tin trong phần «khoa học» (science) thì bao gồm công cụ cho thiên văn "
 "học, sinh học và hoá học, và cũng phần mềm khác liên quan đến khoa học."
 
-#:src/pkg_grouppolicy.cc:184
+#: src/pkg_grouppolicy.cc:184
 msgid ""
 "Command shells and alternative console environments\n"
 " Packages in the 'shells' section include programs providing a command-line "
@@ -3000,7 +3006,7 @@
 "Gói tin trong phần «hệ vỏ» (shells) thì bao gồm chương trình cung cấp giao "
 "diện dòng lệnh."
 
-#:src/pkg_grouppolicy.cc:185
+#: src/pkg_grouppolicy.cc:185
 msgid ""
 "Utilities to play and record sound\n"
 " Packages in the 'sound' section include sound players, recorders, and "
@@ -3014,7 +3020,7 @@
 "lượng, trình sắp xếp MIDI và chương trình tạo ra cách ghi âm nhạc, trình "
 "điều kiện phần cứng âm thanh, và phần mềm xử lý âm thanh."
 
-#:src/pkg_grouppolicy.cc:186
+#: src/pkg_grouppolicy.cc:186
 msgid ""
 "The TeX typesetting system\n"
 " Packages in the 'tex' section are related to TeX, a system for producing "
@@ -3029,7 +3035,7 @@
 "TeX sang nhiều khuôn dạng khác nhau, phông chữ TeX, và  phần mềm khác liên "
 "quan đến TeX."
 
-#:src/pkg_grouppolicy.cc:187
+#: src/pkg_grouppolicy.cc:187
 msgid ""
 "Text processing utilities\n"
 " Packages in the 'text' section include text filters and processors, "
@@ -3045,7 +3051,7 @@
 "và DOS), trình định dạng văn bản và trình sửa đổi văn bản sang «in xinh»; và "
 "phần mềm khác thao tác «nhập thô»."
 
-#:src/pkg_grouppolicy.cc:188
+#: src/pkg_grouppolicy.cc:188
 msgid ""
 "Various system utilities\n"
 " Packages in the 'utils' section are utilities whose purpose is too unique "
@@ -3055,7 +3061,7 @@
 "Gói tin trong phần «tiện ích» (utils.) thì là trình tiện ích không khớp với "
 "nhóm nào."
 
-#:src/pkg_grouppolicy.cc:189
+#: src/pkg_grouppolicy.cc:189
 msgid ""
 "Web browsers, servers, proxies, and other tools\n"
 " Packages in the 'web' section include Web browsers, Web servers and "
@@ -3068,7 +3074,7 @@
 "trình đựa vào Mạng, chương trình đựa vào Mạng có sẵn, và phần mềm khác liên "
 "quan đến Mạng."
 
-#:src/pkg_grouppolicy.cc:190
+#: src/pkg_grouppolicy.cc:190
 msgid ""
 "The X window system and related software\n"
 " Packages in the 'x11' section include the core packages for the X window "
@@ -3080,7 +3086,7 @@
 "trình quản lý cửa sổ, trình tiện ích cho X, và chương trình khác có giao "
 "diện đồ họa X mà có trong nhóm này vì không khớp với nhóm khác nào."
 
-#:src/pkg_grouppolicy.cc:192
+#: src/pkg_grouppolicy.cc:192
 msgid ""
 "Programs which depend on software not in Debian\n"
 " Packages in the 'contrib' section are not part of Debian.\n"
@@ -3105,7 +3111,7 @@
 "Để tìm thông tin thêm về ý kiến Debian về Phần mềm Tự do, hãy xem http://www."
 "debian.org/social_contract#guidelines."
 
-#:src/pkg_grouppolicy.cc:193
+#: src/pkg_grouppolicy.cc:193
 msgid ""
 "The main Debian archive\n"
 " The Debian distribution consists of packages from the 'main' section. Every "
@@ -3121,7 +3127,7 @@
 "Để tìm thông tin thêm về ý kiến Debian về Phần mềm Tự do, hãy xem http://www."
 "debian.org/social_contract#guidelines."
 
-#:src/pkg_grouppolicy.cc:194
+#: src/pkg_grouppolicy.cc:194
 msgid ""
 "Programs stored outside the US due to export controls\n"
 " Packages in 'non-US' likely contain cryptography; a few implement patented "
@@ -3143,7 +3149,7 @@
 "có. Như thế thì gần tắt cả gói đã có trong phần này vào lúc trước, lúc này "
 "trong phần 'main' (chính)."
 
-#:src/pkg_grouppolicy.cc:195
+#: src/pkg_grouppolicy.cc:195
 msgid ""
 "Programs which are not free software\n"
 " Packages in the 'non-free' section are not part of Debian.\n"
@@ -3167,7 +3173,7 @@
 "Để tìm thông tin thêm về ý kiến Debian về Phần mềm Tự do, hãy xem http://www."
 "debian.org/social_contract#guidelines."
 
-#:src/pkg_grouppolicy.cc:197
+#: src/pkg_grouppolicy.cc:197
 msgid ""
 "Virtual packages\n"
 " These packages do not exist; they are names other packages use to require "
@@ -3177,27 +3183,27 @@
 "Gói trong phần này không tồn tại: nó chỉ là tên được dùng bởi gói khác để "
 "cần thiết hay cung cấp chức năng nào."
 
-#:src/pkg_grouppolicy.cc:212
+#: src/pkg_grouppolicy.cc:212
 msgid "Tasks/Tasks"
 msgstr "Tác vụ/Tác vụ"
 
-#:src/pkg_grouppolicy.cc:212 src/pkg_grouppolicy.cc:942
+#: src/pkg_grouppolicy.cc:212 src/pkg_grouppolicy.cc:942
 msgid "Tasks"
 msgstr "Tác vụ"
 
-#:src/pkg_grouppolicy.cc:218
+#: src/pkg_grouppolicy.cc:218
 msgid "Unknown/Unknown"
 msgstr "Không biết/Không biết"
 
-#:src/pkg_grouppolicy.cc:224
+#: src/pkg_grouppolicy.cc:224
 msgid "virtual/virtual"
 msgstr "ảo/ảo"
 
-#:src/pkg_grouppolicy.cc:235
+#: src/pkg_grouppolicy.cc:235
 msgid "main"
 msgstr "chính"
 
-#:src/pkg_grouppolicy.cc:320
+#: src/pkg_grouppolicy.cc:320
 msgid ""
 "Security Updates\n"
 " Security updates for these packages are available from security.debian.org."
@@ -3206,7 +3212,7 @@
 "Trình cập nhật cho những gói tin này công bố tại nơi Mạng «security.debian."
 "org»."
 
-#:src/pkg_grouppolicy.cc:321
+#: src/pkg_grouppolicy.cc:321
 msgid ""
 "Upgradable Packages\n"
 " A newer version of these packages is available."
@@ -3214,7 +3220,7 @@
 "Gói tin có thể cập nhật\n"
 "Có phiên bản mới hơn của những gói tin này."
 
-#:src/pkg_grouppolicy.cc:322
+#: src/pkg_grouppolicy.cc:322
 msgid ""
 "New Packages\n"
 " These packages have been added to Debian since the last time you cleared "
@@ -3226,7 +3232,7 @@
 "«mới» (new) lần trước. Hãy chọn lệnh «Quên các gói mới» từ trình đơn «Hành "
 "động» để xóa danh sách ấy."
 
-#:src/pkg_grouppolicy.cc:323
+#: src/pkg_grouppolicy.cc:323
 msgid ""
 "Installed Packages\n"
 " These packages are currently installed on your computer."
@@ -3234,7 +3240,7 @@
 "Gói tin đã cài đặt\n"
 "Những gói tin này hiện thời có càì đăt trên máy vi tính bạn."
 
-#:src/pkg_grouppolicy.cc:324
+#: src/pkg_grouppolicy.cc:324
 msgid ""
 "Not Installed Packages\n"
 " These packages are not installed on your computer."
@@ -3242,7 +3248,7 @@
 "Gói tin chưa cài\n"
 "Những gói tin này hiện thời không có cài đặt trên máy vi tính bạn."
 
-#:src/pkg_grouppolicy.cc:325
+#: src/pkg_grouppolicy.cc:325
 msgid ""
 "Obsolete and Locally Created Packages\n"
 " These packages are currently installed on your computer, but they are not "
@@ -3254,7 +3260,7 @@
 "thể gọi điều ấy từ nguồn apt nào. Có lẽ gói tin trong phần này là cũ, bị "
 "loại bỏ ra kho, hoặc có lẽ bạn tự xây dụng phiên bản riêng của nó."
 
-#:src/pkg_grouppolicy.cc:326
+#: src/pkg_grouppolicy.cc:326
 msgid ""
 "Virtual Packages\n"
 " These packages do not exist; they are names other packages use to require "
@@ -3264,7 +3270,7 @@
 "Gói tin trong phần này không tồn tại: nó chỉ là tên được dùng bởi gói tin "
 "khác để cần thiết hay cung cấp chức năng nào."
 
-#:src/pkg_grouppolicy.cc:473
+#: src/pkg_grouppolicy.cc:473
 msgid ""
 "Packages which are recommended by other packages\n"
 " These packages are not strictly required, but they may be necessary to "
@@ -3276,7 +3282,7 @@
 "cấp chức năng đầy đủ trong một số chương trình khác mà bạn hiện có cài đặt "
 "hay cập nhật."
 
-#:src/pkg_grouppolicy.cc:493
+#: src/pkg_grouppolicy.cc:493
 msgid ""
 "Packages which are suggested by other packages\n"
 " These packages are not required in order to make your system function "
@@ -3288,7 +3294,7 @@
 "nhưng mà có lẽ sẽ cung cấp chức năng thêm cho một số chương trình mà bạn "
 "hiện có cài."
 
-#:src/pkg_grouppolicy.cc:520
+#: src/pkg_grouppolicy.cc:520
 msgid ""
 "Packages with unsatisfied dependencies\n"
 " The dependency requirements of these packages will be unmet after the "
@@ -3303,7 +3309,7 @@
 "\n"
 "Cây này rất có thể ngụ ý là lỗi trong hệ thống ban hay trong kho Debian."
 
-#:src/pkg_grouppolicy.cc:521
+#: src/pkg_grouppolicy.cc:521
 msgid ""
 "Packages being removed because they are no longer used\n"
 " These packages are being deleted because they were automatically installed "
@@ -3315,7 +3321,7 @@
 "cách phụ thuộc, nhưng mà hành động đã định sẽ có kết quả là không có gói tin "
 "nào phụ thuộc một cách quan trọng («important») vào gói tin này.\n"
 
-#:src/pkg_grouppolicy.cc:522
+#: src/pkg_grouppolicy.cc:522
 msgid ""
 "Packages being automatically held in their current state\n"
 " These packages could be upgraded, but they have been kept in their current "
@@ -3325,7 +3331,7 @@
 "Có thể cập nhật những gói tin này, nhưng mà chưa làm như thế để tránh ngắt "
 "đường dẫn phụ thuộc."
 
-#:src/pkg_grouppolicy.cc:523
+#: src/pkg_grouppolicy.cc:523
 msgid ""
 "Packages being automatically installed to satisfy dependencies\n"
 " These packages are being installed because they are required by another "
@@ -3335,7 +3341,7 @@
 "Những gói tin này sẽ được cài vì cần thiết bởi một gói khác mà bạn đã chọn "
 "cài."
 
-#:src/pkg_grouppolicy.cc:524
+#: src/pkg_grouppolicy.cc:524
 msgid ""
 "Packages being deleted due to unsatisfied dependencies\n"
 " These packages are being deleted because one or more of their dependencies "
@@ -3345,7 +3351,7 @@
 "Gói tin trong phần này sẽ bị xóa bỏ vì một hay nhiều cách phụ thuộc của nó "
 "không còn công bố, hoặc vì một gói khác xung đột với nó."
 
-#:src/pkg_grouppolicy.cc:525
+#: src/pkg_grouppolicy.cc:525
 msgid ""
 "Packages to be downgraded\n"
 " An older version of these packages than is currently installed will be "
@@ -3354,7 +3360,7 @@
 "Gói tin sẽ bị hạ cấp\n"
 "Sẽ cài một phiên bản cũ hơn phiên bản hiện có cài của các gói tin này."
 
-#:src/pkg_grouppolicy.cc:526
+#: src/pkg_grouppolicy.cc:526
 msgid ""
 "Packages being held back\n"
 " These packages could be upgraded, but you have asked for them to be held at "
@@ -3364,7 +3370,7 @@
 "Có thể cập nhật những gói tin này, nhưng mà bạn đã chọn giữ lại phiên bản "
 "hiện có."
 
-#:src/pkg_grouppolicy.cc:527
+#: src/pkg_grouppolicy.cc:527
 msgid ""
 "Packages to be reinstalled\n"
 " These packages will be reinstalled."
@@ -3372,7 +3378,7 @@
 "Gói tin sẽ được cài lại\n"
 "Sẽ cài lại những gói tin này."
 
-#:src/pkg_grouppolicy.cc:528
+#: src/pkg_grouppolicy.cc:528
 msgid ""
 "Packages to be installed\n"
 " These packages have been manually selected for installation on your "
@@ -3381,7 +3387,7 @@
 "Gói tin sẽ được cài\n"
 "Bạn đã tự chọn cài những gói tin này vào máy vi tính mình."
 
-#:src/pkg_grouppolicy.cc:529
+#: src/pkg_grouppolicy.cc:529
 msgid ""
 "Packages to be removed\n"
 " These packages have been manually selected for removal."
@@ -3389,7 +3395,7 @@
 "Gói tin se bị loại bỏ\n"
 "Bạn đã tự chọn loại bỏ những gói tin này ra máy vi tính mình."
 
-#:src/pkg_grouppolicy.cc:530
+#: src/pkg_grouppolicy.cc:530
 msgid ""
 "Packages to be upgraded\n"
 " These packages will be upgraded to a newer version."
@@ -3397,48 +3403,48 @@
 "Gói tin sẽ được cập nhật\n"
 "Sẽ cập nhật những gói tin này lên phiên bản mới hơn."
 
-#:src/pkg_grouppolicy.cc:645
+#: src/pkg_grouppolicy.cc:645
 msgid "unknown"
 msgstr "không biết"
 
-#:src/pkg_grouppolicy.cc:656
-#,c-format
+#: src/pkg_grouppolicy.cc:656
+#, c-format
 msgid "Priority %s"
 msgstr "Ưu tiên %s"
 
-#:src/pkg_grouppolicy.cc:766
+#: src/pkg_grouppolicy.cc:766
 msgid "UNCATEGORIZED"
 msgstr "CHƯA_PHÂN_LOẠI"
 
-#:src/pkg_grouppolicy.cc:885
+#: src/pkg_grouppolicy.cc:885
 msgid "End-user"
 msgstr "Người dùng cuối"
 
-#:src/pkg_grouppolicy.cc:886
+#: src/pkg_grouppolicy.cc:886
 msgid "Servers"
 msgstr "Máy phục vụ"
 
-#:src/pkg_grouppolicy.cc:887
+#: src/pkg_grouppolicy.cc:887
 msgid "Development"
 msgstr "Phát triển"
 
-#:src/pkg_grouppolicy.cc:888
+#: src/pkg_grouppolicy.cc:888
 msgid "Localization"
 msgstr "Bản địa hóa"
 
-#:src/pkg_grouppolicy.cc:889
+#: src/pkg_grouppolicy.cc:889
 msgid "Hardware Support"
 msgstr "Hỗ trợ phần cứng"
 
-#:src/pkg_grouppolicy.cc:890
+#: src/pkg_grouppolicy.cc:890
 msgid "Miscellaneous"
 msgstr "Lặt vặt"
 
-#:src/pkg_grouppolicy.cc:891
+#: src/pkg_grouppolicy.cc:891
 msgid "Unrecognized tasks"
 msgstr "Tác vụ không nhận ra"
 
-#:src/pkg_grouppolicy.cc:943
+#: src/pkg_grouppolicy.cc:943
 msgid ""
 "\n"
 " Tasks are groups of packages which provide an easy way to select a "
@@ -3448,38 +3454,38 @@
 "Tác vụ là nhóm gói cung cấp cách dễ để chọn một bộ gói đã định nghĩa trước "
 "cho một mục đích nào đó."
 
-#:src/pkg_info_screen.cc:116
+#: src/pkg_info_screen.cc:116
 msgid "Compressed size: "
 msgstr "Cỡ đã nén:"
 
-#:src/pkg_info_screen.cc:117
+#: src/pkg_info_screen.cc:117
 msgid "Uncompressed size: "
 msgstr "Cỡ giải nén:"
 
-#:src/pkg_info_screen.cc:118
+#: src/pkg_info_screen.cc:118
 msgid "Source Package: "
 msgstr "Gói tin nguồn:"
 
-#:src/pkg_info_screen.cc:128
-#,c-format
+#: src/pkg_info_screen.cc:128
+#, c-format
 msgid "Package names provided by %s"
 msgstr "Các tên gói do «%s» cung cấp"
 
-#:src/pkg_info_screen.cc:138
-#,c-format
+#: src/pkg_info_screen.cc:138
+#, c-format
 msgid "Packages which depend on %s"
 msgstr "Các gói phụ thuộc vào «%s»"
 
-#:src/pkg_info_screen.cc:143
+#: src/pkg_info_screen.cc:143
 msgid "Versions"
 msgstr "Phiên bản"
 
-#:src/pkg_item.cc:56
+#: src/pkg_item.cc:56
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Tôi hiểu rằng làm như thế là ý kiến xấu lắm."
 
-#:src/pkg_item.cc:81
-#,c-format
+#: src/pkg_item.cc:81
+#, c-format
 msgid ""
 "%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
 "s' if you are."
@@ -3487,52 +3493,52 @@
 "• «%s» là một gói tin cần yếu. •%n%nBạn có chắc muốn loại bỏ nó không?%nHãy "
 "gõ «%s» nếu có."
 
-#:src/pkg_item.cc:221 src/pkg_ver_item.cc:633
-#,c-format
+#: src/pkg_item.cc:221 src/pkg_ver_item.cc:633
+#, c-format
 msgid "Information about %s"
 msgstr "Thông tin về «%s»"
 
-#:src/pkg_item.cc:223 src/pkg_ver_item.cc:635
-#,c-format
+#: src/pkg_item.cc:223 src/pkg_ver_item.cc:635
+#, c-format
 msgid "%s info"
 msgstr "%s thông tin"
 
-#:src/pkg_item.cc:309
-#,c-format
+#: src/pkg_item.cc:309
+#, c-format
 msgid "Available versions of %s"
 msgstr "Các phiên bản công bố của «%s»"
 
-#:src/pkg_item.cc:312
-#,c-format
+#: src/pkg_item.cc:312
+#, c-format
 msgid "%s versions"
 msgstr "Phiên bản «%s»"
 
-#:src/pkg_item.cc:324 src/pkg_ver_item.cc:663
-#,c-format
+#: src/pkg_item.cc:324 src/pkg_ver_item.cc:663
+#, c-format
 msgid "Dependencies of %s"
 msgstr "Cách phụ thuộc của «%s»"
 
-#:src/pkg_item.cc:326 src/pkg_ver_item.cc:665
-#,c-format
+#: src/pkg_item.cc:326 src/pkg_ver_item.cc:665
+#, c-format
 msgid "%s deps"
 msgstr "%s phụ"
 
-#:src/pkg_item.cc:337 src/pkg_ver_item.cc:675
-#,c-format
+#: src/pkg_item.cc:337 src/pkg_ver_item.cc:675
+#, c-format
 msgid "Packages depending on %s"
 msgstr "Các gói khác phụ thuộc vào %s"
 
-#:src/pkg_item.cc:339 src/pkg_ver_item.cc:677
-#,c-format
+#: src/pkg_item.cc:339 src/pkg_ver_item.cc:677
+#, c-format
 msgid "%s reverse deps"
 msgstr "%s phụ đảo"
 
-#:src/pkg_item.cc:391 src/pkg_ver_item.cc:715
-#,c-format
+#: src/pkg_item.cc:391 src/pkg_ver_item.cc:715
+#, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Thông báo lỗi trong %s:\n"
 
-#:src/pkg_item.cc:413
+#: src/pkg_item.cc:413
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
 "this package, install the menu package, the login package, or run aptitude "
@@ -3543,122 +3549,122 @@
 "này, hãy cài gói tin trình đơn (menu), cài gói tin đăng nhập (login), hoặc "
 "chạy trình aptitude với tư cách người chủ."
 
-#:src/pkg_item.cc:421
-#,c-format
+#: src/pkg_item.cc:421
+#, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Đang cấu hình lại «%s»\n"
 
-#:src/pkg_item.cc:446
+#: src/pkg_item.cc:446
 msgid "Hierarchy editor"
 msgstr "Bộ sửa đổi cây"
 
-#:src/pkg_item.cc:446
+#: src/pkg_item.cc:446
 msgid "Hierarchy Editor"
 msgstr "Bộ sửa đổi cây"
 
-#:src/pkg_tree.cc:325
+#: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Tìm kiếm:"
 
-#:src/pkg_tree.cc:579
+#: src/pkg_tree.cc:579
 msgid "All Packages"
 msgstr "Tất cả gói tin"
 
-#:src/pkg_tree.cc:592 src/pkg_tree.cc:603
+#: src/pkg_tree.cc:592 src/pkg_tree.cc:603
 msgid "Building view"
 msgstr "Khung xem xây dụng"
 
-#:src/pkg_tree.cc:646
-#,c-format
+#: src/pkg_tree.cc:646
+#, c-format
 msgid "No packages matched the pattern \"%ls\"."
 msgstr "Không có gói nào khớp với mẫu «%ls»."
 
-#:src/pkg_tree.cc:668
+#: src/pkg_tree.cc:668
 msgid "Enter the new package tree limit: "
 msgstr "Hãy nhập giới hạn cây gói mới:"
 
-#:src/pkg_tree.cc:702
+#: src/pkg_tree.cc:702
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr "Hãy nhập cơ chế nhóm lại gói mới cho bộ trình bày này:"
 
-#:src/pkg_tree.cc:710
+#: src/pkg_tree.cc:710
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "ãy nhập cơ chế sắư xếp gói mới cho bộ trình bày này:"
 
-#:src/pkg_view.cc:133
+#: src/pkg_view.cc:133
 msgid "Couldn't transcode column definition"
 msgstr "Không thể dịch mã hóa lời định nghĩa cột."
 
-#:src/pkg_view.cc:140
+#: src/pkg_view.cc:140
 msgid "Couldn't parse column definition"
 msgstr "Không thể phân tách lời định nghĩa cột."
 
-#:src/pkg_view.cc:158
+#: src/pkg_view.cc:158
 msgid "Encoding error in long description."
 msgstr "Gặp lỗi biên mã trong mô tả dài."
 
-#:src/pkg_view.cc:370
+#: src/pkg_view.cc:370
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 "make_package_view: (tạo khung xem gói) gặp lỗi trong đối số — hai ô điều "
 "khiển chính?"
 
-#:src/pkg_view.cc:376
+#: src/pkg_view.cc:376
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: (tạo khung xem gói) gặp lỗi trong đối số -- danh sách cột "
 "sai cho mục tĩnh."
 
-#:src/pkg_view.cc:469
+#: src/pkg_view.cc:469
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: (tạo khung xem gói) đối số sai."
 
-#:src/pkg_view.cc:521
+#: src/pkg_view.cc:521
 msgid "make_package_view: no main widget found"
 msgstr ""
 "make_package_view: (tạo khung xem gói) không tìm thấy ô điều khiển chính nào."
 
-#:src/reason_fragment.cc:30
+#: src/reason_fragment.cc:30
 msgid "depends on"
 msgstr "phụ thuộc vào"
 
-#:src/reason_fragment.cc:32
+#: src/reason_fragment.cc:32
 msgid "pre-depends on"
 msgstr "phụ thuộc trước vào"
 
-#:src/reason_fragment.cc:34
+#: src/reason_fragment.cc:34
 msgid "suggests"
 msgstr "đệ nghị"
 
-#:src/reason_fragment.cc:35
+#: src/reason_fragment.cc:35
 msgid "recommends"
 msgstr "khuyến khích"
 
-#:src/reason_fragment.cc:37
+#: src/reason_fragment.cc:37
 msgid "conflicts with"
 msgstr "xung Ä‘á»™t vá»›i"
 
-#:src/reason_fragment.cc:39
+#: src/reason_fragment.cc:39
 msgid "replaces"
 msgstr "thay thế"
 
-#:src/reason_fragment.cc:40
+#: src/reason_fragment.cc:40
 msgid "obsoletes"
 msgstr "làm cho cũ"
 
-#:src/reason_fragment.cc:166
-#,c-format
+#: src/reason_fragment.cc:166
+#, c-format
 msgid " (provided by %F)"
 msgstr " (được cung cấp bởi %F)"
 
 # Variable: do not translate/ biến: đừng dịch
-#:src/reason_fragment.cc:275
-#,c-format
+#: src/reason_fragment.cc:275
+#, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#:src/reason_fragment.cc:324
+#: src/reason_fragment.cc:324
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
@@ -3666,7 +3672,7 @@
 "Nếu bạn chọn một gói, mô tả tính trạng hiện thời nó sẽ xuất hiện trong "
 "trường này."
 
-#:src/reason_fragment.cc:358
+#: src/reason_fragment.cc:358
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
@@ -3674,17 +3680,17 @@
 "%B%s%b đã được cài tự động; nó đang bị loại bỏ vì các gói phụ thuộc vào nó "
 "cũng đang bị loại bỏ."
 
-#:src/reason_fragment.cc:362
+#: src/reason_fragment.cc:362
 msgid "%B%s%b will be automatically removed because of dependency errors:"
 msgstr "%B%s%b sẽ bị loại bỏ tự đông vì gặp lỗi cách phụ thuộc:"
 
-#:src/reason_fragment.cc:366
+#: src/reason_fragment.cc:366
 msgid ""
 "%B%s%b will be automatically installed to satisfy the following dependencies:"
 msgstr ""
 "%B%s%b sẽ được cài tự động để thỏa những tiêu chuẩn cách phụ thuộc theo đây:"
 
-#:src/reason_fragment.cc:372 src/reason_fragment.cc:384
+#: src/reason_fragment.cc:372 src/reason_fragment.cc:384
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
@@ -3692,7 +3698,7 @@
 "Lúc này không thể cập nhật %B%s%b, nhưng nếu có thể thì sẽ giữ lại nó với "
 "phiên bản %B%s%b."
 
-#:src/reason_fragment.cc:375
+#: src/reason_fragment.cc:375
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
@@ -3700,27 +3706,27 @@
 "Sẽ không cập nhật %B%s%b lên phiên bản %B%s%b, để tránh ngắt những cách phụ "
 "thuộc này:"
 
-#:src/reason_fragment.cc:387
+#: src/reason_fragment.cc:387
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b có cài hiện thời."
 
-#:src/reason_fragment.cc:393
+#: src/reason_fragment.cc:393
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b chưa cài hiện thời."
 
-#:src/reason_fragment.cc:401
+#: src/reason_fragment.cc:401
 msgid "Some dependencies of %B%s%b are not satisfied:"
 msgstr "Chưa thỏa một số tiêu chuẩn cách phụ thuộc của %B%s%b."
 
-#:src/reason_fragment.cc:405
+#: src/reason_fragment.cc:405
 msgid "%B%s%b will be downgraded."
 msgstr "Sẽ hạ cấp %B%s%b."
 
-#:src/reason_fragment.cc:412
+#: src/reason_fragment.cc:412
 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b."
 msgstr "Sẽ không cập nhật %B%s%b lên phiên bản bị cấm %B%s%b."
 
-#:src/reason_fragment.cc:416
+#: src/reason_fragment.cc:416
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
@@ -3728,39 +3734,39 @@
 "Có thể cập nhật %B%s%b lên phiên bản %B%s%b, nhưng mà hiện thời có giữ lại "
 "nó với phiên bản %B%s%b."
 
-#:src/reason_fragment.cc:423
+#: src/reason_fragment.cc:423
 msgid "%B%s%b will be re-installed."
 msgstr "Sẽ cài lại %B%s%b."
 
-#:src/reason_fragment.cc:427
+#: src/reason_fragment.cc:427
 msgid "%B%s%b will be installed."
 msgstr "Sẽ cài %B%s%b."
 
-#:src/reason_fragment.cc:431
+#: src/reason_fragment.cc:431
 msgid "%B%s%b will be removed."
 msgstr "Sẽ loại bỏ %B%s%b."
 
-#:src/reason_fragment.cc:436
+#: src/reason_fragment.cc:436
 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b."
 msgstr "Sẽ cập nhật %B%s%b từ phiên bản %B%s%b lên phiên bản %B%s%b."
 
-#:src/reason_fragment.cc:472
+#: src/reason_fragment.cc:472
 msgid ""
 "The following packages depend on %B%s%b and will be broken by its removal:"
 msgstr ""
 "Những gói theo đây phụ thuộc vào %B%s%b thì sẽ bị ngắt nếu nó bị loại bỏ:"
 
-#:src/reason_fragment.cc:475
+#: src/reason_fragment.cc:475
 msgid "The following packages depend on %B%s%b and are broken:"
 msgstr "Những gói theo đây phụ thuộc vào %B%s%b thì bị ngắt:"
 
-#:src/reason_fragment.cc:482
+#: src/reason_fragment.cc:482
 msgid ""
 "The following packages conflict with %B%s%b and will be broken by its "
 "installation:"
 msgstr "Những gói theo đây xung đột vớí %B%s%b thì sẽ bị ngắt nếu nó có cài:"
 
-#:src/reason_fragment.cc:515
+#: src/reason_fragment.cc:515
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b, or conflict with the currently "
@@ -3769,7 +3775,7 @@
 "Những gói theo đây phụ thuộc vào một phiên bản %B%s%b khác với phiên bản "
 "hiện có cài, hoặc xung đột với phiên bản hiện có cài."
 
-#:src/reason_fragment.cc:519
+#: src/reason_fragment.cc:519
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
@@ -3777,11 +3783,11 @@
 "Những gói theo đây xung đột với %B%s%b, hoặc phụ thuộc vào một phiên bản nó "
 "sẽ không được cài."
 
-#:src/reason_fragment.cc:523
+#: src/reason_fragment.cc:523
 msgid "The following packages conflict with %B%s%b:"
 msgstr "Những gói theo đây xung đột với %B%s%b:"
 
-#:src/reason_fragment.cc:528
+#: src/reason_fragment.cc:528
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
@@ -3789,22 +3795,22 @@
 "Những gói theo đây phụ thuộc vào một phiên bản %B%s%b khác với phiên bản %B%s"
 "%b hiện có cài."
 
-#:src/reason_fragment.cc:532
+#: src/reason_fragment.cc:532
 msgid ""
 "The following packages depend on a version of %B%s%b which is not going to "
 "be installed."
 msgstr ""
 "Những gói theo đây phụ thuôc vào một phiên bản %B%s%b sẽ không được cài."
 
-#:src/reason_fragment.cc:538
+#: src/reason_fragment.cc:538
 msgid "upgraded"
 msgstr "đã cập nhật"
 
-#:src/reason_fragment.cc:538
+#: src/reason_fragment.cc:538
 msgid "downgraded"
 msgstr "bị hạ cấp"
 
-#:src/reason_fragment.cc:544
+#: src/reason_fragment.cc:544
 msgid ""
 "The following packages depend on the currently installed version of %B%s%b (%"
 "B%s%b), or conflict with the version it will be %s to (%B%s%b), and will be "
@@ -3814,7 +3820,7 @@
 "xung đột với phiên bản sẽ có sau khi %s lên/xuống (%B%s%b) thì sẽ bị ngắt "
 "nếu làm như thế."
 
-#:src/reason_fragment.cc:551
+#: src/reason_fragment.cc:551
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3822,7 +3828,7 @@
 "Những gói theo đây xung đột với phiên bản %B%s%b %B%s%b thì sẽ bị ngắt nếu "
 "nó được %s."
 
-#:src/reason_fragment.cc:556
+#: src/reason_fragment.cc:556
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
@@ -3830,20 +3836,20 @@
 "Những gói theo đây phụ thuộc vào phiên bản %B%s%b %B%s%b thì se bị ngắt nếu "
 "nó %s."
 
-#:src/solution_dialog.cc:74
+#: src/solution_dialog.cc:74
 msgid "The package cache is not available."
 msgstr "Bộ nhớ tạm gói tin chưa sẵn sàng."
 
-#:src/solution_dialog.cc:82
+#: src/solution_dialog.cc:82
 msgid "No packages are broken."
 msgstr "Không có gói tin bị ngắt."
 
-#:src/solution_dialog.cc:103
+#: src/solution_dialog.cc:103
 msgid "No resolution found."
 msgstr "Chưa tìm giải pháp."
 
-#:src/solution_dialog.cc:107
-#,c-format
+#: src/solution_dialog.cc:107
+#, c-format
 msgid ""
 "Time exhausted while searching for a solution (you can select \"Next Solution"
 "\" or press %s to try harder)."
@@ -3851,56 +3857,56 @@
 "Hết thời gian khi tìm kiếm giải pháp. (Bạn có thể chọn «Giải pháp kế» hay "
 "bấm %s để cố tích cực hơn.)"
 
-#:src/solution_dialog.cc:146
+#: src/solution_dialog.cc:146
 msgid "Previous"
 msgstr "TrÆ°á»›c"
 
-#:src/solution_dialog.cc:147
+#: src/solution_dialog.cc:147
 msgid "Next"
 msgstr "Kế"
 
-#:src/solution_dialog.cc:148
+#: src/solution_dialog.cc:148
 msgid "Apply"
 msgstr "Áp dụng"
 
-#:src/solution_dialog.cc:149
+#: src/solution_dialog.cc:149
 msgid "Close"
 msgstr "Đóng"
 
-#:src/solution_fragment.cc:134
+#: src/solution_fragment.cc:134
 msgid "%BRemove%b the following packages:%n"
 msgstr "%BRemove%b the following packages:%n"
 
-#:src/solution_fragment.cc:144
+#: src/solution_fragment.cc:144
 msgid "%BInstall%b the following packages:%n"
 msgstr "%BCài đặt%b những gói tin theo đây:%n"
 
-#:src/solution_fragment.cc:157
+#: src/solution_fragment.cc:157
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr "%BGiữ%b những gói tin theo đây tại mức độ phiên bản hiện có:%n"
 
-#:src/solution_fragment.cc:164
+#: src/solution_fragment.cc:164
 msgid "Not Installed"
 msgstr "Chưa cài đặt"
 
-#:src/solution_fragment.cc:177
+#: src/solution_fragment.cc:177
 msgid "%BUpgrade%b the following packages:%n"
 msgstr "%BNâng cấp%b những gói tin theo đây:%n"
 
-#:src/solution_fragment.cc:192
+#: src/solution_fragment.cc:192
 msgid "%BDowngrade%b the following packages:%n"
 msgstr "%BHạ cấp%b những gói tin theo đây:%n"
 
-#:src/solution_fragment.cc:206
-#,c-format
+#: src/solution_fragment.cc:206
+#, c-format
 msgid "Score is %d"
 msgstr "Điểm là %d"
 
-#:src/trust.cc:17 src/trust.cc:19
+#: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#:src/trust.cc:18
+#: src/trust.cc:18
 msgid ""
 "%F: This version of %s is from an %Buntrusted source%b!  Installing this "
 "package could allow a malicious individual to damage or take control of your "
@@ -3910,53 +3916,53 @@
 "gói này có thể cho phép một người hiểm độc có phá hoại hay điều khiển máy vi "
 "tính của bạn."
 
-#:src/ui.cc:165
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Ừm, không có lỗi nào: không biết sao như vậy..."
 
-#:src/ui.cc:171
+#: src/ui.cc:171
 msgid "E:"
 msgstr "Đ."
 
-#:src/ui.cc:173
+#: src/ui.cc:173
 msgid "W:"
 msgstr "T."
 
-#:src/ui.cc:187
+#: src/ui.cc:187
 msgid "Search for:"
 msgstr "Tìm kiếm:"
 
-#:src/ui.cc:252
+#: src/ui.cc:252
 msgid "You already are root!"
 msgstr "Bạn có đăng nhập như là người chủ rồi."
 
-#:src/ui.cc:350
+#: src/ui.cc:350
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Tiến trình con đã thoát với lỗi -- bạn có gõ đúng mật khẩu không?"
 
-#:src/ui.cc:378
+#: src/ui.cc:378
 msgid "Loading cache"
 msgstr "Tải bộ nhớ tạm..."
 
-#:src/ui.cc:400
+#: src/ui.cc:400
 msgid "Really quit Aptitude?"
 msgstr "Thật sự thoát trình Aptitude không?"
 
-#:src/ui.cc:479
+#: src/ui.cc:479
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Thật sự xóa bỏ các thiết lập cá nhân của bạn và tải lại điều mặc định không?"
 
-#:src/ui.cc:579 src/ui.cc:581 src/ui.cc:609 src/ui.cc:611
+#: src/ui.cc:579 src/ui.cc:581 src/ui.cc:609 src/ui.cc:611
 msgid "Packages"
 msgstr "Gói tin"
 
-#:src/ui.cc:580 src/ui.cc:610
+#: src/ui.cc:580 src/ui.cc:610
 msgid "View available packages and choose actions to perform"
 msgstr "Xem các gói tin công bố và chọn hành động cần thực hiện"
 
-#:src/ui.cc:657
+#: src/ui.cc:657
 msgid ""
 "Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
@@ -3968,23 +3974,23 @@
 "Trợ giúp. Đây là phần mềm tự do, vì vậy bạn có thể phân phối lại nó với một "
 "số điều kiện nào đó: hãy xem «Bản quyền» để tìm chi tiết."
 
-#:src/ui.cc:678
+#: src/ui.cc:678
 msgid "help.txt"
 msgstr "help.txt"
 
-#:src/ui.cc:680
+#: src/ui.cc:680
 msgid "Encoding of help.txt|UTF-8"
 msgstr "UTF-8"
 
-#:src/ui.cc:699
+#: src/ui.cc:699
 msgid "README"
 msgstr "README"
 
-#:src/ui.cc:701
+#: src/ui.cc:701
 msgid "Encoding of README|UTF-8"
 msgstr "UTF-8"
 
-#:src/ui.cc:787
+#: src/ui.cc:787
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!%"
 "n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -3995,40 +4001,40 @@
 "không đáng tin có thể %Bhại thậm bảo mật của hệ thống bạn%b.  Bạn nên chỉ "
 "tiếp tục cài nếu có chắc muốn làm như thế.%n%n"
 
-#:src/ui.cc:793
+#: src/ui.cc:793
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [version %s]%n"
 
-#:src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "Thật tiếp tục"
 
-#:src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "Hủy bỏ cài"
 
-#:src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Xem trước cách cài gói"
 
-#:src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Xem và/hay sửa đổi những hành động sẽ thực hiện."
 
-#:src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "Xem thá»­"
 
-#:src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "Một số gói tin bị ngắt thì đã sửa hết:"
 
-#:src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "Cho những vấn đề cách phụ thuộc này, không có giải pháp nào cả."
 
-#:src/ui.cc:913
-#,c-format
+#: src/ui.cc:912
+#, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
@@ -4036,7 +4042,7 @@
 "Hết thời gian khi cố gắng tháo gỡ cách phụ thuộc (hãy bấm «%s» để cố tích "
 "cực hơn)."
 
-#:src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4044,23 +4050,23 @@
 "Cài đặt / loai bỏ gói tin cần thiết quyền truy cập quản trị mà bạn hiện thời "
 "không có. Bạn có muốn chuyển đổi sang tài khoản ngươi chủ (root) phải không?"
 
-#:src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "Trờ thành người chủ"
 
-#:src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "Đừng trở thành người chủ"
 
-#:src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "Việc cập nhật hay cài danh sách gói có đang xảy ra."
 
-#:src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Không có gói nào định cài, loại bỏ hay cập nhật."
 
-#:src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -4070,7 +4076,7 @@
 "gói tin, nhưng mà bạn chưa chọn nâng cấp gì. Hãy gõ phím «U» để chuẩn bị "
 "nâng cấp."
 
-#:src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -4079,24 +4085,24 @@
 "hiện thời không có. Bạn có muốn chuyển đổi sang tài khoản người chủ phải "
 "không?"
 
-#:src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "Mật thời gian khi cố tìm mìn."
 
-#:src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Không cho phép xóa trong khi tải về gì."
 
-#:src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "Đang xóa bỏ tập tin đã tải về..."
 
-#:src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "Mới xóa bỏ những tập tin gói tin đã tải về rồi."
 
-#:src/ui.cc:1174
-#,c-format
+#: src/ui.cc:1173
+#, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
@@ -4104,88 +4110,88 @@
 "Mới xóa bỏ những tập tin gói tin cũ đã tải về, mà giải phóng thêm chỗ «%sB» "
 "trên đĩa."
 
-#:src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "Hết giải pháp rồi."
 
-#:src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "Hết thời gian khi cố gắng tìm giải pháp."
 
-#:src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "Không thể tìm một giải pháp có thể áp dụng."
 
-#:src/ui.cc:1306
-#,c-format
+#: src/ui.cc:1305
+#, c-format
 msgid "Unable to open %ls"
 msgstr "Không mở được «%ls»."
 
-#:src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "Gặp lỗi khi đổ tính trạng bộ thái gỡ."
 
-#:src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "Đổ tính trạng bộ tháo gỡ vào tập tin này:"
 
-#:src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "^Cài / loại bỏ gói"
 
-#:src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "Thực hiện mọi việc cài hay loại bỏ sắp"
 
-#:src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "^Cập nhật danh sách gói"
 
-#:src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "Kiểm tra có phiên bản gói mới"
 
-#:src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "^Quên các gói mới"
 
-#:src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "Quên gói nào là «Mới»"
 
-#:src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "^Xóa bộ nhớ tạm gói"
 
-#:src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "Xóa bỏ tập tin gói đã tải về trước"
 
-#:src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "Xóa tập tin ^cũ"
 
-#:src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Xóa bỏ tập tin gói không còn có thể tải về lại"
 
-#:src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "Nhãn ^co thể cập nhật"
 
-#:src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Đánh dấu mọi gói cập nhật mà không được giữ lại cho cập nhật"
 
-#:src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "^Chơi Quét mìn"
 
-#:src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "^Trở thành người chủ"
 
-#:src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -4193,79 +4199,79 @@
 "Hãy chạy lệnh «su» để trở thành người chủ: lệnh này sẽ khởi chạy lại chương "
 "trình này, còn giữ các thiết lập của bạn."
 
-#:src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "^Tải lại bộ nhớ tạm gói"
 
-#:src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "Tải lại bộ nhớ tạm gói"
 
-#:src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "^Thoát"
 
-#:src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "Thoát khỏi chương trình"
 
-#:src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "Hồi lại"
 
-#:src/ui.cc:1397
+#: src/ui.cc:1396
 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/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "^Cài"
 
-#:src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Nhãn gói đã chọn hiện thời để cài hay cập nhật."
 
-#:src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "^Bỏ"
 
-#:src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "Nhãn gói đã chọn hiện thời để loại bỏ."
 
-#:src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "^Tẩy"
 
-#:src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Nhãn gói đã chọn hiện thời và các tập tin câu hình để loại bỏ."
 
-#:src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "^Giữ"
 
-#:src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "Thôi hành động nào với gói được chọn."
 
-#:src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "^Giữ lại"
 
-#:src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "Thôi hành động nào với gói được chọn, và bảo vệ nó khoi những cập nhật sau."
 
-#:src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "Nhãn ^Tự động"
 
-#:src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -4273,11 +4279,11 @@
 "Đánh dấu gói tin đã chọn «đã được cài đặt tự động»; nó sẽ bi loại bỏ tự động "
 "nếu không có gói tin khác phụ thuộc vào nó."
 
-#:src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "Nhãn ^Thủ công"
 
-#:src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -4285,303 +4291,306 @@
 "Đánh dấu gói đã chọn «đã được cài đặt thủ công»; sẽ không loại bỏ nó trừ khi "
 "bạn tự loại bỏ nó."
 
-#:src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "^Cấm phiên bản"
 
-#:src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
 msgstr ""
 "Cấm cài phiên bản ứng cử của gói đã chọn; sẽ tiếp tục cài phiên bản mới hơn."
 
-#:src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "Thông ti^n"
 
-#:src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "Hiển thị thông tin thêm về gói tin đã chọn."
 
-#:src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "Bản ghi ^đổi"
 
-#:src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "Hiển thị bản ghi các thay đổi (ChangeLog) cho gói đa chọn."
 
-#:src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "^Tìm"
 
-#:src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "Tìm gói."
 
-#:src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "Tìm ^lại"
 
-#:src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "Tìm lại chuỗi mới tìm"
 
-#:src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "^Hạn hiển thị"
 
-#:src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "Áp dụng bô lọc vào danh sách gói."
 
-#:src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "^Bỏ hạn hiển thị"
 
-#:src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "Loại bỏ bộ lọc ra danh sách gói."
 
-#:src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "Tìm bị ^ngắt"
 
-#:src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Tìm gói kế phụ thuộc vào phần mềm chưa có."
 
-#:src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "Tùy chọn _giao diện người dùng"
 
-#:src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "Thay đổi thiết lập làm ảnh hưởng đến giao diện người dùng."
 
-#:src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "^Quản lý cách phụ thuộc"
 
-#:src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Thay đổi thiết lập làm ảnh hưởng đến quản lý cách phụ thuộc thế nào."
 
-#:src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "^Linh tinh"
 
-#:src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "Thay đổi thiết lập chương trình linh tinh."
 
-#:src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "^Trở về tùy chọn"
 
-#:src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "Hoàn nguyên trở lại các thiết lập thành điều măc định hệ thống."
 
-#:src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "^Kế"
 
-#:src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "Xem bộ trình bày kế tiếp"
 
-#:src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "^TrÆ°á»›c"
 
-#:src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "Xem bộ trình bày trước"
 
-#:src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "^Đóng"
 
-#:src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "Đóng bộ trình bày này."
 
-#:src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "Khung ^xem gói mới"
 
-#:src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "Tạo một khung xem gói mặc định mới."
 
-#:src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "Bộ ^duyệt phân loại mới"
 
-#:src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "Duyệt các gói theo loại."
 
-#:src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "^Giới thiệu"
 
-#:src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "Xem thông tin về chương trình này."
 
-#:src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "^Trợ giúp"
 
-#:src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "Xem trợ giúp trực tuyến."
 
-#:src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "^Sổ hướng dẫn người dùng"
 
-#:src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "Xem sổ hướng dẫn chi tiết cho chương trình này."
 
-#:src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "^Hỏi đáp"
 
-#:src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "Xem danh sách câu thường hỏi"
 
-#:src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "^TIN TỨC"
 
-#:src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "Xem những thay đổi quan trọng thuộc về mỗi phiên bản "
 
-#:src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "^Bản quyền"
 
-#:src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "Xem những điều kiện sao chép chương trình này"
 
-#:src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "Hành động"
 
-#:src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "Tìm"
 
-#:src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "Tùy chọn"
 
-#:src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "Xem"
 
-#:src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "Trợ giúp"
 
-#:src/ui.cc:1731
-#,c-format
+#: src/ui.cc:1730
+#, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
-"%ls: Trình đơn  %ls: Trợ giúp  %ls: Thoát  %ls: Cập nhật  %ls: Tải về/Cài/Loại bỏ "
-"Gói"
+"%ls: Trình đơn  %ls: Trợ giúp  %ls: Thoát  %ls: Cập nhật  %ls: Tải về/Cài/"
+"Loại bỏ Gói"
 
-#:src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "yes_key"
 
-#:src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "no_key"
 
-#:src/view_changelog.cc:63
+#: src/view_changelog.cc:63
 msgid "You can only view changelogs of official Debian packages."
 msgstr ""
 "Bạn chỉ có thể xem bản ghi các thay đổi thuộc về gói Debian chính thức."
 
-#:src/view_changelog.cc:69
+#: src/view_changelog.cc:69
 msgid "Downloading Changelog"
 msgstr "Tải về Bản ghi đổi..."
 
-#:src/view_changelog.cc:71
+#: src/view_changelog.cc:71
 msgid "Download Changelog"
 msgstr "Tải về Bản ghi sửa đổi"
 
-#:src/view_changelog.cc:81
-#,c-format
+#: src/view_changelog.cc:81
+#, c-format
 msgid "%s changes"
 msgstr "%s thay đổi"
 
-#:src/vscreen/config/column_definition.cc:93
-#:src/vscreen/config/column_definition.cc:108
+#: src/vscreen/config/column_definition.cc:93
+#: src/vscreen/config/column_definition.cc:108
 msgid "Formatting marker with missing format code"
 msgstr "Đang định dạng bộ đánh dấu thiếu mã định dạng"
 
-#:src/vscreen/config/column_definition.cc:117
-#,c-format
+#: src/vscreen/config/column_definition.cc:117
+#, c-format
 msgid "Bad number in format string: '%ls'"
 msgstr "Gặp số sai trong chuỗi định dạng: «%ls»"
 
-#:src/vscreen/config/column_definition.cc:137
-#,c-format
+#: src/vscreen/config/column_definition.cc:137
+#, c-format
 msgid "Unknown formatting code '%lc'"
 msgstr "Không biết mã định dạng: «%lc»"
 
-#:src/vscreen/config/keybindings.cc:314
-#,c-format
+#: src/vscreen/config/keybindings.cc:314
+#, c-format
 msgid "Cannot parse key description: %ls"
 msgstr "Không thể phân tách mô tả phím: %ls"
 
-#:src/vscreen/config/keybindings.cc:324
+#: src/vscreen/config/keybindings.cc:324
 msgid "Invalid null keybinding"
 msgstr "Tổ hợp phím rỗng không hợp lệ"
 
-#:src/vscreen/config/keybindings.cc:332
+#: src/vscreen/config/keybindings.cc:332
 msgid "Sorry, control modifiers may not be used with unprintable characters"
-msgstr "Rất tiếc là không cho phép dùng ký tự điều khiển bổ trợ với ký tự không thể in."
+msgstr ""
+"Rất tiếc là không cho phép dùng ký tự điều khiển bổ trợ với ký tự không thể "
+"in."
 
-#:src/vscreen/vscreen.cc:120
-#,c-format
+#: src/vscreen/vscreen.cc:120
+#, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
 msgstr "Ôi! Gặp SIGTERM thì đang chết...\n"
 
-#:src/vscreen/vscreen.cc:123
-#,c-format
+#: src/vscreen/vscreen.cc:123
+#, c-format
 msgid "Ouch!  Got SIGSEGV, dying..\n"
 msgstr "Ôi! Gặp SIGSEGV thì đang chết...\n"
 
-#:src/vscreen/vscreen.cc:126
-#,c-format
+#: src/vscreen/vscreen.cc:126
+#, c-format
 msgid "Ouch!  Got SIGABRT, dying..\n"
 msgstr "Ôi! Gặp SIGABRT thì đang chết...\n"
 
-#:src/vscreen/vscreen.cc:129
-#,c-format
+#: src/vscreen/vscreen.cc:129
+#, c-format
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ôi! Gặp SIGQUIT thì đang chết...\n"
 
-#:src/vscreen/vs_pager.cc:379
-#,c-format
+#: src/vscreen/vs_pager.cc:397
+#, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."
-msgstr "Không thể tải tên tập tin: chuỗi «%ls» không có dạng biểu diễn đa byte. "
+msgstr ""
+"Không thể tải tên tập tin: chuỗi «%ls» không có dạng biểu diễn đa byte. "
 
-#:src/vscreen/vs_tree.cc:793
+#: src/vscreen/vs_tree.cc:793
 msgid "TOP LEVEL"
 msgstr "CẤP ĐẦU"
 

Modified: branches/aptitude-0.3/aptitude/po/zh_CN.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/zh_CN.po	(original)
+++ branches/aptitude-0.3/aptitude/po/zh_CN.po	Wed Jul  6 22:10:50 2005
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.13\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-15 20:48+0200\n"
 "Last-Translator: Yongtao Yang <yongtao.yang at telia.com>\n"
 "Language-Team: zh_CN <i18n-translation at lists.linux.net.cn>\n"
@@ -901,62 +901,66 @@
 "as necessary."
 msgstr "修改将导致当前解决方案被放弃或者必须重新计算。"
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 msgid "The following actions will resolve these dependencies:"
 msgstr "下列动作将解决这些依赖关系:"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "是否接受该解决方案?[Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "放弃解决这些依赖关系的全部努力。"
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 msgid "The following commands are available:"
 msgstr "下列命令可选:"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr "将依赖关系解决状态写入文件:"
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "无法打开 %s 以写入"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "将依赖关系解决状态写入文件 %s 时发生错误"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "非法响应;请输入下列命令之一:"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "在分配的时间内未找到解决方案。加把劲再试试?[Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "非法响应;请输入 'y' 或者 'n'。"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "未能解决依赖关系!放弃..."
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr "没有更多的解决方案了。"
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "查找:您必须提供至少一个查找项\n"
@@ -1256,7 +1260,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "无法清空列表目录"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "删除过期的下载文件"
 
@@ -2137,7 +2141,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr "警告:可视化界面将忽略 -s/Cmdline::Simulate\n"
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "扫雷"
 
@@ -2344,7 +2348,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "软件包"
 
@@ -3833,65 +3837,65 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr " %S*%n %s [版本号 %s]%n"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "真的继续"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "中止安装"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "预览软件包安装"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "查看以及/或者调整将要被执行的动作"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 msgid "Preview"
 msgstr "预览"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 msgid "Some packages were broken and have been fixed:"
 msgstr "某些破损的包已经被修补:"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr "这些依赖关系没有解决方案!"
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "试图搜寻解决方案时用时已尽 (按“%s”加把劲儿再试试)"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "安装/删除软件包需要管理员权限,而您现在没有这种权限。您想要进入 root 帐号吗?"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "变成 root"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "不变成 root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "已经开始了一个软件包列表更新或者安装的动作。"
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "没有任何软件包被设定为安装,删除或者升级。"
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
@@ -3900,430 +3904,430 @@
 "没有任何软件包将被安装,删除或者升级。某些软件包可以升级,但是您没有选择将它"
 "们升级。输入“U”以准备升级。"
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "更新软件包列表需要管理员权限,而您现在没有这种权限。您想要进入 root 帐号吗?"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "通过找地雷来消磨时间"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "在下载进行过程中不允许执行清除"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "删除下载的文件"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "下载的文件已经被删除"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "过期的下载文件已经被删除,正在释放 %sB 的磁盘空间。"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr "所有的解决方案都试过了。"
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 msgid "Ran out of time while trying to find a solution."
 msgstr "寻找解决方案时用时已尽。"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr "未能找到一个可以应用的解决方案。"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "无法打开 %s"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr "存储依赖关系解决状态时出错"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr "存储依赖关系解决状态的文件:"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "安装/卸载软件包(^I)"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "执行所有等待执行的安装和卸载任务"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "更新软件包列表(^U)"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "正在检查新版本的软件包"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "忘记新软件包(^F)"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "忘记哪些软件包是“新”的"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "清除软件包缓存(^C)"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "删除以前下载的软件包文件"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "关闭过期文件(^O)"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "删除无法再下载的软件包文件"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "标记可升级的(^U)"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "为所有未被保持现状的软件包加上升级标记"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "玩扫雷游戏(^P)"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "变成 root(^B)"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr "运行“su”成为 root。这将重新启动程序,但是您的设置将会被保存下来。"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "重新载入软件包缓存(^R)"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "重新载入软件包缓存"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "退出(^Q)"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "退出此程序"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "撤消"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "撤销最近一次或者一组软件包操作"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "安装(^I)"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "标记当前选择的软件包以安装或者升级"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "删除(^R)"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "标记当前选择的软件包以删除"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "清除(^P)"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "标记当前选择的软件包和它的配置文件以删除"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "保持(^K)"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "取消选定软件包上的任何动作"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "保持(^H)"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "取消选定软件包上的任何动作,并且保护它免于以后被升级"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "标记为自动安装(^A)"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
 msgstr ""
 "将所选定的软件包标记为自动安装;如果没有其它软件包依赖于它,它将会被自动删除"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "标记为手动安装(^M)"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 "将所选定的软件包标记为手动安装;除非您手动删除该软件包,否则它将不会被删除"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "禁止版本(^F)"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
 msgstr "禁止安装选定软件包的候选版本;该软件包的新版本将可以正常安装"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "信息(^N)"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "显示关于选定软件包上的更多信息"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "变更日志(^C)"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "显示选定软件包上的变更日志"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "查找(^F)"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "搜索一个软件包"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "继续查找(^A)"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "重复上一次查找"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "限制显示(^L)"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "使用过滤器过滤软件包列表"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "取消显示限制(^U)"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "取消软件包列表中过滤器的效果"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "搜寻损坏(^F)"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "下列软件包存在未满足的依赖关系:"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "用户界面选项(^U)"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "修改影响用户界面的设置"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "处理依赖关系(^D)"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "改变影响处理依赖关系的设置"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "杂项(^M)"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "改变程序的杂项设置"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "还原选项(^R)"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "把所有项目重设为它们的默认值"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "下一个(^N)"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "查看下一个画面"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "上一个(^P)"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "查看上一画面"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "关闭(^C)"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "关闭此画面"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "新建软件包视图(^V)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "创建新的默认软件包视图"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "新建分类浏览器(^B)"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "分类浏览软件包"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "关于(^A)"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "查看关于此程序的信息"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "帮助(^H)"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "查看在线帮助"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "用户手册(^M)"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "查看详细的程序使用手册"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "常见问题回答(^F)"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "查看常见问题列表"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr "æ–°é—»(^N)"
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 msgid "View the important changes made in each version of "
 msgstr "查看该程序每一版本中所做的重大修改"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "许可证(^L)"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "查看您可以在何种条款下拷贝该程序"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "动作"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "搜索"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "选项"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "查看"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "帮助"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr "%s:菜单  %s:帮助  %s:退出  %s:更新  %s:下载/安装包"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "是_按键"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "否_按键"
 
@@ -4393,7 +4397,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "啊!接收到 SIGQUIT 信号,正在退出..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."

Modified: branches/aptitude-0.3/aptitude/po/zh_TW.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/zh_TW.po	(original)
+++ branches/aptitude-0.3/aptitude/po/zh_TW.po	Wed Jul  6 22:10:50 2005
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-07-04 13:03-0400\n"
+"POT-Creation-Date: 2005-07-06 18:09-0400\n"
 "PO-Revision-Date: 2005-06-02 11:05+0800\n"
 "Last-Translator: Rex Tsai <chihchun at linux.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n at linux.org.tw>\n"
@@ -917,66 +917,70 @@
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:169
+#: src/cmdline/cmdline_resolver.cc:172
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "以下套件含有相依性:\n"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
+#: src/cmdline/cmdline_resolver.cc:215 src/cmdline/cmdline_resolver.cc:290
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:222
+#: src/cmdline/cmdline_resolver.cc:225
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "以下的套件狀態為毀斷"
 
-#: src/cmdline/cmdline_resolver.cc:237
+#: src/cmdline/cmdline_resolver.cc:240
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#: src/cmdline/cmdline_resolver.cc:243 src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "無法打開 %s 以寫入"
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:248
 #, fuzzy, c-format
 msgid "Error writing resolver state to %s"
 msgstr "寫入狀態檔案時發生錯誤"
 
 #: src/cmdline/cmdline_resolver.cc:250
+msgid "Resolver state successfully written!"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:255
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "錯誤回應。請輸入一個正確的指令或 '?' 以取得協助。\n"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:265
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:293
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "錯誤回應。請輸入一個正確的指令或 '?' 以取得協助。\n"
 
-#: src/cmdline/cmdline_resolver.cc:297
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:302
+#: src/cmdline/cmdline_resolver.cc:307
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:70
+#: src/cmdline/cmdline_search.cc:72
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:86
+#: src/cmdline/cmdline_search.cc:88
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "搜尋: 您至少要提供一個搜尋字串\n"
@@ -1276,7 +1280,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "無法清空列表目錄"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1151
 msgid "Deleting obsolete downloaded files"
 msgstr "刪除過期的下載檔案"
 
@@ -2156,7 +2160,7 @@
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
-#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1089
+#: src/mine/cmine.cc:88 src/mine/cmine.cc:130 src/ui.cc:1088
 msgid "Minesweeper"
 msgstr "掃雷"
 
@@ -2363,7 +2367,7 @@
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:86 src/ui.cc:1667
+#: src/pkg_columnizer.cc:86 src/ui.cc:1666
 msgid "Package"
 msgstr "套件"
 
@@ -3870,44 +3874,44 @@
 msgid "  %S*%N %s [version %s]%n"
 msgstr "版本號"
 
-#: src/ui.cc:800
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr "繼續進行"
 
-#: src/ui.cc:802
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr "放棄安裝"
 
-#: src/ui.cc:863
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "預覽套件安裝"
 
-#: src/ui.cc:864
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "檢視與/或調整即將執行的指令"
 
-#: src/ui.cc:865
+#: src/ui.cc:864
 #, fuzzy
 msgid "Preview"
 msgstr "上一個(^P)"
 
-#: src/ui.cc:901
+#: src/ui.cc:900
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "某些毀斷的套件已經被修補!"
 
-#: src/ui.cc:907
+#: src/ui.cc:906
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:913
+#: src/ui.cc:912
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "玩玩踩地雷來消磨時間"
 
-#: src/ui.cc:959
+#: src/ui.cc:958
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3916,23 +3920,23 @@
 "安裝/刪除套件需要管理員權限,而您現在\n"
 "沒有這種權限。您想要進入 root 帳號嗎?\n"
 
-#: src/ui.cc:962 src/ui.cc:1077
+#: src/ui.cc:961 src/ui.cc:1076
 msgid "Become root"
 msgstr "變成 root(^B)"
 
-#: src/ui.cc:964 src/ui.cc:1079
+#: src/ui.cc:963 src/ui.cc:1078
 msgid "Don't become root"
 msgstr "不變成 root"
 
-#: src/ui.cc:969 src/ui.cc:1084
+#: src/ui.cc:968 src/ui.cc:1083
 msgid "A package-list update or install run is already taking place."
 msgstr "已經開始了一個套件列表更新或者安裝的動作。"
 
-#: src/ui.cc:996
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "沒有套件被預定安裝、升級或移除。"
 
-#: src/ui.cc:1002
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3944,7 +3948,7 @@
 "某些套件可以被升級,但是您並沒有選擇升級它們。\n"
 "輸入 \"U\" 來準備升級。"
 
-#: src/ui.cc:1074
+#: src/ui.cc:1073
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3953,112 +3957,112 @@
 "更新套件列表需要管理員權限,而您現在\n"
 "沒有這種權限。您想要進入 root 帳號嗎?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1376
+#: src/ui.cc:1088 src/ui.cc:1375
 msgid "Waste time trying to find mines"
 msgstr "玩玩踩地雷來消磨時間"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1095 src/ui.cc:1148
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "在下載進行過程中不允許執行清除"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1098
 msgid "Deleting downloaded files"
 msgstr "刪除下載的檔案"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1112
 msgid "Downloaded package files have been deleted"
 msgstr "下載的檔案已經被刪除"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1173
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "過期的下載檔案已經被刪除"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1245
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1250 src/ui.cc:1281
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "玩玩踩地雷來消磨時間"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1275
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1305
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "無法打開 %s 以寫入"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1311
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1321
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1351
 msgid "^Install/remove packages"
 msgstr "安裝/移除套件(^I)"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1352
 msgid "Perform all pending installs and removals"
 msgstr "執行所有等待執行的安裝和移除作業"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1354
 msgid "^Update package list"
 msgstr "更新套件列表(^U)"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1355
 msgid "Check for new versions of packages"
 msgstr "正在檢查新版本的套件"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1358
 msgid "^Forget new packages"
 msgstr "忽略新套件(^F)"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1359
 msgid "Forget which packages are \"new\""
 msgstr "忽略哪些套件是 '新' 的"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1362
 msgid "^Clean package cache"
 msgstr "清除套件快取(^C)"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1363
 msgid "Delete package files which were previously downloaded"
 msgstr "刪除以前下載的套件檔案"
 
-#: src/ui.cc:1367
+#: src/ui.cc:1366
 msgid "Clean ^obsolete files"
 msgstr "關閉過期檔案(^O)"
 
-#: src/ui.cc:1368
+#: src/ui.cc:1367
 msgid "Delete package files which can no longer be downloaded"
 msgstr "刪除無法再下載的套件檔案"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1370
 msgid "Mark ^Upgradable"
 msgstr "標記為可升級(^U)"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1371
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "為所有未被保持現狀的套件加上升級標記"
 
-#: src/ui.cc:1375
+#: src/ui.cc:1374
 msgid "^Play Minesweeper"
 msgstr "玩掃雷遊戲(^P)"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1377
 msgid "^Become root"
 msgstr "變成 root(^B)"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1378
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4067,78 +4071,78 @@
 "執行 'su' 成為 root。這將重新啟動程式,但是您的\n"
 "設置將會被保存下來。"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1381
 msgid "^Reload package cache"
 msgstr "重新載入套件快取(^R)"
 
-#: src/ui.cc:1383
+#: src/ui.cc:1382
 msgid "Reload the package cache"
 msgstr "重新載入套件快取"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1388
 msgid "^Quit"
 msgstr "退出(^Q)"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1389
 msgid "Exit the program"
 msgstr "退出此程序"
 
-#: src/ui.cc:1396 src/ui.cc:1666
+#: src/ui.cc:1395 src/ui.cc:1665
 msgid "Undo"
 msgstr "復原"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1396
 msgid "Undo the last package operation or group of operations"
 msgstr "復原最近一次或者一組操作"
 
-#: src/ui.cc:1404
+#: src/ui.cc:1403
 msgid "^Install"
 msgstr "安裝(^I)"
 
-#: src/ui.cc:1405
+#: src/ui.cc:1404
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "標示安裝或升級現選的套件"
 
-#: src/ui.cc:1408
+#: src/ui.cc:1407
 msgid "^Remove"
 msgstr "移除(^R)"
 
-#: src/ui.cc:1409
+#: src/ui.cc:1408
 msgid "Flag the currently selected package for removal"
 msgstr "標示移除現選的套件"
 
-#: src/ui.cc:1412
+#: src/ui.cc:1411
 msgid "^Purge"
 msgstr "清除(^P)"
 
-#: src/ui.cc:1413
+#: src/ui.cc:1412
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "標示移除現選的套件與其設定檔"
 
-#: src/ui.cc:1416
+#: src/ui.cc:1415
 msgid "^Keep"
 msgstr "保留(^K)"
 
-#: src/ui.cc:1417
+#: src/ui.cc:1416
 msgid "Cancel any action on the selected package"
 msgstr "取消選擇的套件上的任何動作"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1419
 msgid "^Hold"
 msgstr "保留(^H)"
 
-#: src/ui.cc:1421
+#: src/ui.cc:1420
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "取消在選擇套件的任何指令,並保證未來也不升級"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1423
 msgid "Mark ^Auto"
 msgstr "標示為自動(^A)"
 
-#: src/ui.cc:1425
+#: src/ui.cc:1424
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4147,11 +4151,11 @@
 "標示自動安裝選擇的套件;\n"
 "如果沒有其他套件相依於上,它將會被自動移除"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1427
 msgid "Mark ^Manual"
 msgstr "標示為手動處理(^M)"
 
-#: src/ui.cc:1429
+#: src/ui.cc:1428
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4160,11 +4164,11 @@
 "標示手動安裝選擇的套件;\n"
 "除非您手動移除,否則它將不會被移除"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1431
 msgid "^Forbid Version"
 msgstr "禁制版本(^F)"
 
-#: src/ui.cc:1433
+#: src/ui.cc:1432
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4173,215 +4177,215 @@
 "禁制安裝選擇套件的候選版本;\n"
 "新版本的套件將會像往常一樣被安裝"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1436
 msgid "I^nformation"
 msgstr "資訊(^n)"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1437
 msgid "Display more information about the selected package"
 msgstr "顯示選擇的套件之細節資訊"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1440
 msgid "^Changelog"
 msgstr "變更紀錄(^C)"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1441
 msgid "Display the Debian changelog of the selected package"
 msgstr "顯示選擇套件的 Debian 更改紀錄"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1448
 msgid "^Find"
 msgstr "尋找(^F)"
 
-#: src/ui.cc:1450
+#: src/ui.cc:1449
 msgid "Search for a package"
 msgstr "搜尋套件"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1452
 msgid "Find ^Again"
 msgstr "重新尋找(^A)"
 
-#: src/ui.cc:1454
+#: src/ui.cc:1453
 msgid "Repeat the last search"
 msgstr "重複最後尋找"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1457
 msgid "^Limit Display"
 msgstr "限制顯示(^L)"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1458
 msgid "Apply a filter to the package list"
 msgstr "套用套件列表篩選"
 
-#: src/ui.cc:1462
+#: src/ui.cc:1461
 msgid "^Un-Limit Display"
 msgstr "無限制顯示(^U)"
 
-#: src/ui.cc:1463
+#: src/ui.cc:1462
 msgid "Remove the filter from the package list"
 msgstr "移除套件列表的篩選"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1466
 msgid "Find ^Broken"
 msgstr "搜尋損壞套件(^B)"
 
-#: src/ui.cc:1468
+#: src/ui.cc:1467
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "尋找下個未滿足相依性的套件"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1474
 msgid "^UI options"
 msgstr "用戶界面選項(^U)"
 
-#: src/ui.cc:1476
+#: src/ui.cc:1475
 msgid "Change the settings which affect the user interface"
 msgstr "修改影響用戶界面的設置"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1478
 msgid "^Dependency handling"
 msgstr "處理依賴關係(^D)"
 
-#: src/ui.cc:1480
+#: src/ui.cc:1479
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "改變影響處理依賴關係的設置"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1482
 msgid "^Miscellaneous"
 msgstr "雜項(^M)"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1483
 msgid "Change miscellaneous program settings"
 msgstr "改變程序的雜項設置"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1488
 msgid "^Revert options"
 msgstr "還原選項(^R)"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1489
 msgid "Reset all settings to the system defaults"
 msgstr "把所有項目重設為它們的預設值"
 
-#: src/ui.cc:1501
+#: src/ui.cc:1500
 msgid "^Next"
 msgstr "下一個(^N)"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1501
 msgid "View next display"
 msgstr "查看下一個畫面"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1504
 msgid "^Prev"
 msgstr "上一個(^P)"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1505
 msgid "View previous display"
 msgstr "查看上一畫面"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1508
 msgid "^Close"
 msgstr "關閉(^C)"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1509
 msgid "Close this display"
 msgstr "關閉此畫面"
 
-#: src/ui.cc:1515
+#: src/ui.cc:1514
 msgid "New Package ^View"
 msgstr "新套件視野(^V)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1515
 msgid "Create a new default package view"
 msgstr "建立新的預設套件視野"
 
-#: src/ui.cc:1519
+#: src/ui.cc:1518
 msgid "New Categorical ^Browser"
 msgstr "新分類瀏覽器(^B)"
 
-#: src/ui.cc:1521
+#: src/ui.cc:1520
 msgid "Browse packages by category"
 msgstr "分類瀏覽套件"
 
-#: src/ui.cc:1529
+#: src/ui.cc:1528
 msgid "^About"
 msgstr "關於(^A)"
 
-#: src/ui.cc:1530
+#: src/ui.cc:1529
 msgid "View information about this program"
 msgstr "查看關於此程式的資訊"
 
-#: src/ui.cc:1533
+#: src/ui.cc:1532
 msgid "^Help"
 msgstr "求助(^H)"
 
-#: src/ui.cc:1534
+#: src/ui.cc:1533
 msgid "View the on-line help"
 msgstr "查看線上求助"
 
-#: src/ui.cc:1536
+#: src/ui.cc:1535
 msgid "User's ^Manual"
 msgstr "用戶手冊(^M)"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1536
 msgid "View the detailed program manual"
 msgstr "瀏覽詳細的使用手冊"
 
-#: src/ui.cc:1540
+#: src/ui.cc:1539
 msgid "^FAQ"
 msgstr "常見問題(^F)"
 
-#: src/ui.cc:1541
+#: src/ui.cc:1540
 msgid "View a list of frequently asked questions"
 msgstr "瀏覽常見問題列表"
 
-#: src/ui.cc:1544
+#: src/ui.cc:1543
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1545
+#: src/ui.cc:1544
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "查看此程式每一版本中所做的重大修改"
 
-#: src/ui.cc:1548
+#: src/ui.cc:1547
 msgid "^License"
 msgstr "許可證(^L)"
 
-#: src/ui.cc:1549
+#: src/ui.cc:1548
 msgid "View the terms under which you may copy the program"
 msgstr "查看您可以在何種條款下重製該程式"
 
-#: src/ui.cc:1665
+#: src/ui.cc:1664
 msgid "Actions"
 msgstr "動作"
 
-#: src/ui.cc:1668
+#: src/ui.cc:1667
 msgid "Search"
 msgstr "搜尋"
 
-#: src/ui.cc:1669
+#: src/ui.cc:1668
 msgid "Options"
 msgstr "選項"
 
-#: src/ui.cc:1670
+#: src/ui.cc:1669
 msgid "Views"
 msgstr "查看"
 
-#: src/ui.cc:1671
+#: src/ui.cc:1670
 msgid "Help"
 msgstr "求助"
 
-#: src/ui.cc:1731
+#: src/ui.cc:1730
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr "%s:選單  %s:求助  %s:退出  %s:更新  %s:下載/安裝套件"
 
-#: src/ui.cc:2046 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2045 src/vscreen/vscreen.cc:282
 msgid "yes_key"
 msgstr "確定鍵"
 
-#: src/ui.cc:2047 src/vscreen/vscreen.cc:283
+#: src/ui.cc:2046 src/vscreen/vscreen.cc:283
 msgid "no_key"
 msgstr "否定鍵"
 
@@ -4452,7 +4456,7 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "哎唷! 得到 SIGQUIT, 垂死中..\n"
 
-#: src/vscreen/vs_pager.cc:379
+#: src/vscreen/vs_pager.cc:397
 #, c-format
 msgid ""
 "Unable to load filename: the string %ls has no multibyte representation."



More information about the Aptitude-svn-commit mailing list