[Aptitude-devel] r3242 - in branches/aptitude-0.3/aptitude: . po

Mon Jul 18 15:58:15 UTC 2005

Author: dburrows
Date: Sun May  1 17:18:21 2005
New Revision: 3242

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   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:
Run update-po

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================

--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun May  1 17:18:21 2005
@@ -1,5 +1,9 @@
 2005-05-01  Daniel Burrows  <dburrows at debian.org>
 
+	* po/*.po, po/aptitude.pot:
+
+	Run update-po again.
+
 	* doc/en/manpage.xml:
 
 	Further correct the manual page to adjust for the new stuff in

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-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"
@@ -147,7 +147,7 @@
 msgstr ""
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr ""
@@ -278,79 +278,84 @@
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 ""
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:265
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:268
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:294
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:297
+#: 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"
 msgstr ""
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr ""
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -390,7 +395,7 @@
 msgid "Invalid operation %s"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -401,16 +406,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -463,193 +468,311 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 ""
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr ""
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 msgid "Press Return to continue"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+msgid "toggle the display of changes in package sizes"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+msgid "'+' to install packages"
+msgstr ""
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+msgid "'-' to remove packages"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+msgid "'_' to purge packages"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+msgid "'=' to place packages on hold"
+msgstr ""
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:677
+msgid "Commands:"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -657,7 +780,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -665,7 +788,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -673,7 +796,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -681,7 +804,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -689,7 +812,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -697,100 +820,97 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 msgid "give up and quit the program"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 msgid "The following actions will resolve these dependencies:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 msgid "The following commands are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:250
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr ""
@@ -1085,7 +1205,7 @@
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -1359,23 +1479,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr ""
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1638,298 +1753,298 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
 msgstr ""
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -1960,7 +2075,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr ""
 
@@ -2134,7 +2249,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr ""
 
@@ -3299,52 +3414,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr ""
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr ""
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr ""
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr ""
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr ""
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr ""
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
@@ -3352,15 +3467,15 @@
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr ""
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr ""
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3368,477 +3483,490 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 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:1073
+#: src/ui.cc:1074
 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:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, c-format
+msgid "Unable to open %s"
+msgstr ""
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 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:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 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:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr ""
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr ""
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr ""
 
@@ -3878,11 +4006,3 @@
 #, c-format
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr ""
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr ""
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr ""

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-11-27 23:06+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
@@ -149,7 +149,7 @@
 msgstr "Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØØ²Ù… Ø§Ù„ØºÙŠØ± Ù…Ø³ØªØ®Ø¯Ù…Ø© ÙˆØ§Ù„ØªÙŠ ØªÙˆØ§ÙÙ‚ Ø¹Ø§Ù…Ù„ Ø§Ù„ØªØµÙÙŠØ© ØªÙ„Ù‚Ø§Ø¦ÙŠØ§Ù‹"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ù…ÙˆØ§ÙÙ‚"
@@ -292,47 +292,47 @@
 "Ù…Ù„Ø§ØØ¸Ø©: ØªØØ¯ÙŠØ¯ \"%s\" Ø¨Ø¯Ù„Ø§Ù‹ Ù…Ù†\n"
 "      Ø§Ù„ØØ²Ù…Ø© Ø§Ù„ÙˆÙ‡Ù…ÙŠØ© \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s Ù…Ø«Ø¨ØªØ© Ù…Ø³Ø¨Ù‚Ø§Ù‹ Ø¨Ø§Ù„Ù†Ø³Ø®Ø© Ø§Ù„Ù…Ø·Ù„ÙˆØ¨Ø© (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s ØºÙŠØ± Ù…Ø«Ø¨ØªØ© ØØ§Ù„ÙŠØ§Ù‹ØŒ Ù„Ø°Ø§ Ù„Ù† ÙŠØªÙ… ØªØ«Ø¨ÙŠØªÙ‡Ø§ Ù…Ø¬Ø¯Ø¯Ø§Ù‹.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Ø§Ù„ØØ²Ù…Ø© %s ØºÙŠØ± Ù…Ø«Ø¨ØªØ©ØŒ Ù„Ø°Ø§ Ù„Ù† ÙŠØªÙ… Ø¥Ø²Ø§Ù„ØªÙ‡Ø§\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Ø§Ù„ØØ²Ù…Ø© %s ØºÙŠØ± Ù…Ø«Ø¨ØªØ©ØŒ Ù„Ù† ÙŠÙ…ÙƒÙ† Ù…Ù†Ø¹ Ø§Ù„ØªØ±Ù‚ÙŠØ©\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Ø§Ù„ØØ²Ù…Ø© %s ØºÙŠØ± Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ØªØ±Ù‚ÙŠØ©ØŒ Ù„Ø§ ÙŠÙ…ÙƒÙ† Ù…Ù†Ø¹ Ø§Ù„ØªØ±Ù‚ÙŠØ©\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Ù…Ù„Ø§ØØ¸Ø©: ØªØØ¯ÙŠØ¯ Ø§Ù„Ù…Ù‡Ù…Ø© \"%s: %s\" Ù„Ù„ØªØ«Ø¨ÙŠØª\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "ÙŠÙ…ÙƒÙ†Ùƒ ØªØØ¯ÙŠØ¯ Ù†Ø³Ø®Ø© ØØ²Ù…Ø© ÙÙ‚Ø· Ù…Ø¹ Ø£Ù…Ø± Ø§Ù„ØªØ«Ø¨ÙŠØª 'install'\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "ÙŠÙ…ÙƒÙ†Ùƒ ØªØØ¯ÙŠØ¯ Ø£Ø±Ø´ÙŠÙ ØØ²Ù…Ø© ÙÙ‚Ø· Ù…Ø¹ Ø£Ù…Ø± Ø§Ù„ØªØ«Ø¨ÙŠØª 'install'\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -341,7 +341,7 @@
 "Ù„Ù… ÙŠÙ…ÙƒÙ† Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ \"%s\"ØŒ ÙˆØ£ÙƒØ«Ø± Ù…Ù† 40\n"
 "ØØ²Ù…Ø© ØªØØªÙˆÙŠ %s\" ÙÙŠ Ø§Ø³Ù…Ù‡Ø§.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -350,12 +350,12 @@
 "Ù„Ù… ÙŠÙ…ÙƒÙ† Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ \"%s\".  Ø¹Ù„Ù‰ ÙƒÙ„Ù‘ØŒ Ø§Ù„ØØ²Ù…Ø©\n"
 "Ø§Ù„ØªØ§Ù„ÙŠØ© ØªØØªÙˆÙŠ %s\" ÙÙŠ Ø§Ø³Ù…Ù‡Ø§:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Ù„Ù… ÙŠÙ…ÙƒÙ† Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£ÙŠÙ‘Ø© ØØ²Ù…Ø© ÙŠØ·Ø§Ø¨Ù‚ Ø§Ø³Ù…Ù‡Ø§ Ø£Ùˆ ÙˆØµÙÙ‡Ø§ \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -364,7 +364,7 @@
 "Ù„Ù… ÙŠÙ…ÙƒÙ† Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£ÙŠÙ‘Ø© ØØ²Ù…Ø© ØªØ·Ø§Ø¨Ù‚ \"%s\"ØŒ ÙˆØ£ÙƒØ«Ø± Ù…Ù† 40\n"
 "ØØ²Ù…Ø© ØªØØªÙˆÙŠ %s\" ÙÙŠ ÙˆØµÙÙ‡Ø§.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -373,6 +373,11 @@
 "Ù„Ù… ÙŠÙ…ÙƒÙ† Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£ÙŠÙ‘Ø© ØØ²Ù…Ø© ØªØ·Ø§Ø¨Ù‚ \"%s\".  Ø¹Ù„Ù‰ ÙƒÙ„Ù‘ØŒ Ø§Ù„ØØ²Ù…\n"
 "Ø§Ù„ØªØ§Ù„ÙŠØ© ØªØØªÙˆÙŠ %s\" ÙÙŠ ÙˆØµÙÙ‡Ø§:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "ØØ±Ù Ø¹Ù…Ù„ Ø³ÙŠØ¡ '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -412,7 +417,7 @@
 msgid "Invalid operation %s"
 msgstr "Ø¹Ù…Ù„ÙŠØ© ØºÙŠØ± ØµØ§Ù„ØØ© %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -423,16 +428,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "Ø§Ù„ØªÙ†Ø²ÙŠÙ„: ÙŠØ¬Ø¨ ØªØØ¯ÙŠØ¯ ØØ²Ù…Ø© ÙˆØ§ØØ¯Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø£Ù‚Ù„ Ù„ØªÙ†Ø²ÙŠÙ„Ù‡Ø§\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "ØªØ¹Ø°Ø±Øª Ù‚Ø±Ø§Ø¡Ø© Ù„Ø§Ø¦ØØ© Ø§Ù„Ù…ØµØ§Ø¯Ø±"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Ù„Ù… ÙŠÙ…ÙƒÙ† Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£ÙŠÙ‘Ø© ØØ²Ù…Ø© Ø¨Ø§Ù„Ø§Ø³Ù… \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -485,95 +490,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Ù…Ø§ Ø§Ù„Ø£Ù…Ø±ØŸ  Ø¥Ù†Ù‘Ù‡ ÙÙŠÙ„ÙŒ Ø§Ù„ØªÙ‡Ù…Ù‡ Ø«Ø¹Ø¨Ø§Ù† Ø¨Ø§Ù„Ø·Ø¨Ø¹.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "ØªØ¹Ø°Ø±Øª Ù‚Ø±Ø§Ø¡Ø© Ù„Ø§Ø¦ØØ© Ø§Ù„Ù…ØµØ§Ø¯Ø±"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "Ø¥Ù„Ø§ Ø£Ù†Ù‡ ÙŠØ¬Ø¨ ØªØ«Ø¨ÙŠØª %s."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "Ø¥Ù„Ø§ Ø£Ù† %s Ù…Ø«Ø¨ØªØ© ÙˆÙ…ÙØ¨Ù‚Ø§Ø©."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "Ø¥Ù„Ø§ Ø£Ù†Ù‘ %s Ù…Ø«Ø¨ØªØ©."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "Ø¥Ù„Ø§ Ø£Ù†Ù‘Ù‡Ø§ ØºÙŠØ± Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ØªØ«Ø¨ÙŠØª"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " ÙˆØ§Ù„ØªÙŠ Ù‡ÙŠ ØØ²Ù…Ø© ÙˆÙ‡Ù…ÙŠØ©."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " Ø£Ùˆ"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Ø§Ù„ØØ²Ù…Ø© Ø§Ù„ØªØ§Ù„ÙŠØ© Ù…Ø¹Ø·ÙˆØ¨Ø©:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ© ØºÙŠØ± Ù…Ø³ØªØ®Ø¯Ù…Ø© ÙˆØ³ÙˆÙ ØªØ²Ø§Ù„:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "ØªÙ…Ù‘ Ø¥Ø¨Ù‚Ø§Ø¡ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„ØªØ§Ù„ÙŠØ© ØªÙ„Ù‚Ø§Ø¦ÙŠØ§Ù‹:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Ø§Ù„ØØ²Ù… Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ø§Ù„ØªØ§Ù„ÙŠØ© Ø³ÙˆÙ ØªÙØ«Ø¨Øª ØªÙ„Ù‚Ø§Ø¦ÙŠØ§Ù‹:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Ø³ÙŠØªÙ… Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ© ØªÙ„Ù‚Ø§Ø¦ÙŠØ§Ù‹:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ø³ÙŠØªÙ… ØªØ«Ø¨ÙŠØ· Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ©:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "ØªÙ… Ø¥Ø¨Ù‚Ø§Ø¡ Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ©:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Ø³ÙŠØ¹Ø§Ø¯ ØªØ«Ø¨ÙŠØª Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ©:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Ø³ÙŠØªÙ… ØªØ«Ø¨ÙŠØª Ø§Ù„ØØ²Ù… Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ø§Ù„ØªØ§Ù„ÙŠØ©:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Ø³ÙŠØªÙ… Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ©:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Ø³ØªØªÙ… ØªØ±Ù‚ÙŠØ© Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ©:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Ø§Ù„ØØ²Ù… Ø§Ù„Ø£Ø³Ø§Ø³ÙŠÙ‘Ø© Ø§Ù„ØªØ§Ù„ÙŠØ© Ø³ÙŠØªÙ… Ø¥Ø²Ø§Ù„ØªÙ‡Ø§!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Ø³ØªØµØ¨Ø Ø§Ù„ØØ²Ù… Ø§Ù„Ø£Ø³Ø§Ø³ÙŠØ© Ø§Ù„ØªØ§Ù„ÙŠØ© Ù…Ø¹Ø·ÙˆØ¨Ø© Ø¨Ø³Ø¨Ø¨ Ù‡Ø°Ø§ Ø§Ù„Ø¹Ù…Ù„:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -582,99 +587,224 @@
 "ØªØØ°ÙŠØ±: Ø¥Ø¬Ø±Ø§Ø¡ Ù‡Ø°Ø§ Ø§Ù„Ø¹Ù…Ù„ Ø³ÙŠØªØ³Ø¨Ø¨ Ø¹Ù„Ù‰ Ø§Ù„Ø£Ø±Ø¬Ø Ø¨Ø¥Ø¹Ø·Ø§Ø¨ Ù†Ø¸Ø§Ù…Ùƒ!\n"
 "         Ù„Ø§ ØªÙÙƒÙ…Ù„ Ù…Ø§ Ù„Ù… ØªÙƒÙ† Ù…ØªØ£ÙƒÙ‘Ø¯Ø§Ù‹ Ù…Ù…Ø§ ØªÙ‚ÙˆÙ… Ø¨Ù‡ Ø¨Ø§Ù„Ø¶Ø¨Ø·!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Ø£Ø¹Ù„Ù… Ø£Ù† Ù‡Ø°Ù‡ ÙÙƒØ±Ø© Ø³ÙŠØ¦Ø© Ø¬Ø¯Ø§Ù‹"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Ù„Ù„Ø§Ø³ØªÙ…Ø±Ø§Ø±ØŒ Ø§ÙƒØªØ¨ Ø§Ù„Ø¬Ù…Ù„Ø© \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ù†Ø¹Ù…"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Ù„Ø§"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Ù„Ù„Ø§Ø³ØªÙ…Ø±Ø§Ø±ØŒ Ø§ÙƒØªØ¨ Ø§Ù„Ø¬Ù…Ù„Ø© \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ© Ù…Ù‚ØªØ±ØØ© ÙˆÙ„ÙƒÙ† Ù„Ù† ÙŠØªÙ… ØªØ«Ø¨ÙŠØªÙ‡Ø§:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ© Ù…Ù‚ØªØ±ØØ© ÙˆÙ„ÙƒÙ† Ù„Ù† ÙŠØªÙ… ØªØ«Ø¨ÙŠØªÙ‡Ø§:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ù„Ù† ÙŠØªÙ… ØªØ«Ø¨ÙŠØªØŒ Ø£Ùˆ ØªØ±Ù‚ÙŠØ©ØŒ Ø£Ùˆ Ø¥Ø²Ø§Ù„Ø© Ø£ÙŠØ© ØØ²Ù….\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu ØØ²Ù…Ø© ØªÙ…Øª ØªØ±Ù‚ÙŠØªÙ‡Ø§ØŒ Ùˆ%lu ØØ²Ù…Ø© Ø¬Ø¯ÙŠØ¯Ø© ØªÙ… ØªØ«Ø¨ÙŠØªÙ‡Ø§ØŒ "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ØªÙ…Øª Ø¥Ø¹Ø§Ø¯Ø© ØªØ«Ø¨ÙŠØªÙ‡Ø§ØŒ "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu ØªÙ… ØªØ«Ø¨ÙŠØ·Ù‡Ø§ØŒ "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu Ø³ÙŠØªÙ… Ø¥Ø²Ø§Ù„ØªÙ‡Ø§ Ùˆ %lu Ù„Ù… ÙŠØªÙ… ØªØ±Ù‚ÙŠØªÙ‡Ø§.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Ù†ØØªØ§Ø¬ Ø¥Ù„Ù‰ Ø¬Ù„Ø¨ %sØ¨/%sØ¨ Ù…Ù† Ø§Ù„Ø£Ø±Ø´ÙŠÙ. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "ÙŠØ¬Ø¨ Ø¬Ù„Ø¨ %sØ¨ Ù…Ù† Ø§Ù„Ø£Ø±Ø´ÙŠÙ. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "ÙÙƒ ÙÙƒ Ø§Ù„ØªØºÙ„ÙŠÙ Ø³ÙŠØ³ØªØ®Ø¯Ù… %sØ¨.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "ÙÙƒ ÙÙƒ Ø§Ù„ØªØºÙ„ÙŠÙ Ø³ÙŠÙØ±Øº %sØ¨.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "ØØ±Ù Ø¹Ù…Ù„ Ø³ÙŠØ¡ '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ù„ÙŠØ³Øª Ù‡Ù†Ø§Ùƒ ØØ²Ù… Ù„Ø¥Ø¸Ù‡Ø§Ø±Ù‡Ø§ -- Ø£Ø¯Ø®Ù„ Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„ØØ²Ù… Ø¹Ù„Ù‰ Ø§Ù„Ø³Ø·Ø± Ø¨Ø¹Ø¯ 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Ø¥Ø¶ØºØ· Ø²Ø± Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ù„Ù„Ø§Ø³ØªÙ…Ø±Ø§Ø±."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Ù„Ù… ÙŠØ¹Ø«Ø± Ø¹Ù„Ù‰ Ø£ÙŠØ© ØØ²Ù… -- Ø£Ø¯Ø®Ù„ Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„ØØ²Ù… Ø¹Ù„Ù‰ Ø§Ù„Ø³Ø·Ø± Ø¨Ø¹Ø¯ 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Ø¥Ø¶ØºØ· Ø²Ø± Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ù„Ù„Ø§Ø³ØªÙ…Ø±Ø§Ø±."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Ù†Ø³Ù‚ Ø¥Ø¸Ù‡Ø§Ø± Ø¹Ø±ÙˆØ¶ Ø§Ù„ØØ²Ù…"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^ØªØ«Ø¨ÙŠØª/Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØØ²Ù…"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Ø§Ù„ØØ²Ù… Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ø§Ù„ØªØ§Ù„ÙŠØ© Ø³ÙˆÙ ØªÙØ«Ø¨Øª ØªÙ„Ù‚Ø§Ø¦ÙŠØ§Ù‹:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^ØªØ«Ø¨ÙŠØª/Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØØ²Ù…"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Ù†Ø³ÙŠØ§Ù† Ø§Ù„ØØ²Ù… Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+msgid "'=' to place packages on hold"
+msgstr ""
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr "Ø§Ù„ØØ²Ù… Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ø§Ù„ØªØ§Ù„ÙŠØ© Ø³ÙˆÙ ØªÙØ«Ø¨Øª ØªÙ„Ù‚Ø§Ø¦ÙŠØ§Ù‹:"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "ÙŠÙˆØµÙŠ"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ Ø§Ù„Ø§Ø³ØªÙ…Ø±Ø§Ø±ØŸ [Ù†/Ù„/ØŸ]"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -685,7 +815,7 @@
 "Ø³ÙˆÙ ØªØ¸Ù‡Ø± Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„Ù…Ø¹ØªÙ…Ø¯Ø§Øª.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -696,7 +826,7 @@
 "Ù„Ù† ØªØ¸Ù‡Ø± Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„Ù…Ø¹ØªÙ…Ø¯Ø§Øª.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -707,7 +837,7 @@
 "Ø³ØªØ¸Ù‡Ø± Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„Ù†Ø³Ø®Ø©.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -718,7 +848,7 @@
 "Ù„Ù† ØªØ¸Ù‡Ø± Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„Ù†Ø³Ø®Ø©.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -729,7 +859,7 @@
 "Ø³ØªØ¸Ù‡Ø± ØªØºÙŠÙŠØ±Ø§Øª Ø§Ù„ØØ¬Ù….\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -740,125 +870,102 @@
 "Ù„Ù† ØªØ¸Ù‡Ø± ØªØºÙŠÙŠØ±Ø§Øª Ø§Ù„ØØ¬Ù….\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, fuzzy, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Ø§Ù„Ø£ÙˆØ§Ù…Ø±:\n"
-"  y: Ø§Ù„Ø§Ø³ØªÙ…Ø±Ø§Ø± Ø¨Ø§Ù„ØªØ«Ø¨ÙŠØª\n"
-"  n: Ø§Ù„Ø¥Ø¬Ù‡Ø§Ø¶ ÙˆØ§Ù„Ø®Ø±ÙˆØ¬\n"
-"  i: Ø¥Ø¸Ù‡Ø§Ø± Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª ØÙˆÙ„ ÙˆØ§ØØ¯ Ø£Ùˆ Ø£ÙƒØ«Ø± Ù…Ù† Ø§Ù„ØØ²Ù…\n"
-"     ÙŠØ¬Ø¨ Ø£Ù† ØªØªØ¨Ø¹ Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„ØØ²Ù… Ø§Ù„Ø£Ù…Ø± 'i'.\n"
-"  d: Ø¹ÙƒØ³ Ø¹Ø±Ø¶ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„Ù…Ø¹ØªÙ…Ø¯Ø§Øª\n"
-"  s: Ø¹ÙƒØ³ Ø¹Ø±Ø¶ Ø§Ù„ØªÙ‘ØºÙŠÙ‘Ø±Ø§Øª ÙÙŠ ØØ¬Ù… Ø§Ù„ØØ²Ù…\n"
-"  v: Ø¹ÙƒØ³ Ø¹Ø±Ø¶ Ø§Ù„Ù†Ø³Ø®\n"
-"  e: Ø¯Ø®ÙˆÙ„ Ø§Ù„ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ù…Ø±Ø¦ÙŠØ© Ø§Ù„ÙƒØ§Ù…Ù„Ø©\n"
-"\n"
-"  ÙŠÙ…ÙƒÙ† Ø£ÙŠØ¶Ø§Ù‹ ØªØØ¯ÙŠØ¯ Ø§Ù„ØªØºÙŠÙŠØ±Ø§Øª Ø¹Ù„Ù‰ Ù…Ø¬Ù…ÙˆØ¹Ø© Ø£Ø¹Ù…Ø§Ù„ Ø§Ù„ØØ²Ù….\n"
-"  Ù„Ù„Ù‚ÙŠØ§Ù… Ø¨Ø°Ù„ÙƒØŒ Ø§ÙƒØªØ¨ ØØ±Ù Ø§Ù„Ø£Ù…Ø± Ù…ØªØ¨ÙˆØ¹Ø§Ù‹ Ø¨ÙˆØ§ØØ¯ Ø£Ùˆ Ø£ÙƒØ«Ø± Ù…Ù† Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„ØØ²Ù…\n"
-"Ø£Ùˆ Ø§Ù„ØµÙŠØº.  ÙŠØªÙ…Ù‘ Ø¹Ù†Ø¯Ù‡Ø§ ØªØ·Ø¨ÙŠÙ‚ Ø§Ù„Ø¹Ù…Ù„ Ø¹Ù„Ù‰ ÙƒÙ„ Ø§Ù„ØØ²Ù…. (ÙŠÙ…ÙƒÙ†Ùƒ ØªØØ¯ÙŠØ¯\n"
-"Ø£Ø¹Ù…Ø§Ù„ Ø¥Ø¶Ø§ÙÙŠÙ‘Ø©Ø› ÙŠÙØ·Ø¨Ù‘Ù‚ ÙƒÙ„ Ù…Ù†Ù‡Ø§ Ø¹Ù„Ù‰ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„ØªÙŠ ØªÙ„ÙŠÙ‡Ø§)\n"
-"\n"
-"Ø§Ù„Ø£Ø¹Ù…Ø§Ù„:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ø±Ø¯Ù‘ ØºÙŠØ± ØµØ§Ù„Ø.  Ø±Ø¬Ø§Ø¡ Ø£Ø¯Ø®Ù„ Ø£Ù…Ø±Ø§Ù‹ ØµØ§Ù„ØØ§Ù‹ Ø£ 'ØŸ' Ù„Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Ø§Ù„Ø®Ø±ÙˆØ¬ Ù…Ù† Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Ø§Ù„ØØ²Ù… Ø§Ù„ØªØ§Ù„ÙŠØ© Ù„Ù‡Ø§ Ù…Ø¹ØªÙ…Ø¯Ø§Øª ØºÙŠØ± Ù…ØªÙˆÙØ±Ø©:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Ø§Ù„ØØ²Ù…Ø© Ø§Ù„ØªØ§Ù„ÙŠØ© Ù…Ø¹Ø·ÙˆØ¨Ø©:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "ØªØ¹Ø°Ø± ÙØªØ %s Ù„Ù„ÙƒØªØ§Ø¨Ø©"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Ø®Ø·Ø£ ÙÙŠ ÙƒØªØ§Ø¨Ø© Ù…Ù„Ù Ø§Ù„ÙˆØ¶Ø¹"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ø±Ø¯Ù‘ ØºÙŠØ± ØµØ§Ù„Ø.  Ø±Ø¬Ø§Ø¡ Ø£Ø¯Ø®Ù„ Ø£Ù…Ø±Ø§Ù‹ ØµØ§Ù„ØØ§Ù‹ Ø£ 'ØŸ' Ù„Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ø±Ø¯Ù‘ ØºÙŠØ± ØµØ§Ù„Ø.  Ø±Ø¬Ø§Ø¡ Ø£Ø¯Ø®Ù„ Ø£Ù…Ø±Ø§Ù‹ ØµØ§Ù„ØØ§Ù‹ Ø£ 'ØŸ' Ù„Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "Ø§Ù„Ø¨ØØ«: ÙŠØ¬Ø¨ Ø£Ù† ØªØ¹Ø·ÙŠ ÙƒÙ„Ù…Ø© Ø¨ØØ« ÙˆØ§ØØ¯Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø£Ù‚Ù„\n"
@@ -1154,7 +1261,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Ù„Ù… ÙŠÙ…ÙƒÙ† ØªÙ†Ø¸ÙŠÙ Ø£Ø¯Ù„Ø© Ø§Ù„Ù„ÙˆØ§Ø¦Ø"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "ØØ°Ù Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…Ù†Ø²Ù„Ø© Ø§Ù„Ù…Ù„ØºØ§Ø©"
 
@@ -1433,23 +1540,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Ù„Ù… ÙŠÙ…ÙƒÙ† ØªØµØÙŠØ Ø§Ù„Ù…Ø¹ØªÙ…Ø¯Ø§ØªØŒ Ù„Ø°Ø§ Ù„Ù† ÙŠÙ…ÙƒÙ† ØªØ«Ø¨ÙŠØª Ø¨Ø¹Ø¶ Ø§Ù„ØØ²Ù…"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "ØªØ¹Ø°Ø±Øª Ù‚Ø±Ø§Ø¡Ø© Ù„Ø§Ø¦ØØ© Ø§Ù„Ù…ØµØ§Ø¯Ø±."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Ù„ÙˆØ§Ø¦Ø Ø§Ù„ØØ²Ù… Ø£Ùˆ Ù…Ù„Ù Ø§Ù„ÙˆØ¶Ø¹ Ù„Ù… ÙŠÙ…ÙƒÙ† Ø¥Ø¹Ø±Ø§Ø¨Ù‡ Ø£Ùˆ ÙØªØÙ‡."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "Ù‚Ø¯ ØªØ±ØºØ¨ Ø¨ØªØØ¯ÙŠØ« Ù„ÙˆØ§Ø¦Ø Ø§Ù„ØØ²Ù… Ù„ØªØµØÙŠØ Ù‡Ø°Ù‡ Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…ÙÙ‚ÙˆØ¯Ø©"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "ØªØ¹Ø°Ø± ÙØªØ %s Ù„Ù„ÙƒØªØ§Ø¨Ø©"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1714,298 +1816,298 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
 msgstr ""
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2036,7 +2138,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr ""
 
@@ -2210,7 +2312,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "ØØ²Ù…Ø©"
 
@@ -3452,52 +3554,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Ù‡Ù…Ù…ØŒ Ù„ÙŠØ³Øª Ù‡Ù†Ø§Ùƒ Ø£ÙŠØ© Ø£Ø®Ø·Ø§Ø¡ØŒ ÙˆÙ„Ù… ÙŠØ¬Ø¨ Ø£Ù† ÙŠØØ¯Ø« Ù‡Ø°Ø§."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Ø§Ù„Ø¨ØØ« Ø¹Ù†:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Ø£Ù†Øª Ø§Ù„Ø¬Ø°Ø± Ù…Ø³Ø¨Ù‚Ø§!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Ø§Ù„Ø¹Ù…Ù„ÙŠØ© Ø§Ù„ÙØ±Ø¹ÙŠØ© Ø§Ù†ØªÙ‡Øª Ø¨Ø®Ø·Ø£ -- Ù‡Ù„ ÙƒØªØ¨Øª ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø¨Ø´ÙƒÙ„ ØµØÙŠØØŸ"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "ØªØÙ…ÙŠÙ„ Ø§Ù„Ù…Ø®Ø²Ù†"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "ØÙ‚Ø§Ù‹ ØªØ±ÙŠØ¯ Ø§Ù„Ø®Ø±ÙˆØ¬ Ù…Ù† AptitudeØŸ"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "ØÙ‚Ø§Ù‹ ØªØ±ÙŠØ¯ ØªØ¬Ø§Ù‡Ù„ Ø¥Ø¹Ø§Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø´Ø®ØµÙŠØ© ÙˆØ¥Ø¹Ø§Ø¯Ø© ØªØÙ…ÙŠÙ„ Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠÙ‘Ø§ØªØŸ"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Ø¹Ø±Ø¶ Ø§Ù„ØØ²Ù… Ø§Ù„Ù…ØªÙˆÙØ±Ø© ÙˆØ§Ø®ØªÙŠØ§Ø± Ø§Ù„Ø£Ø¹Ù…Ø§Ù„ Ù„Ù„Ù‚ÙŠØ§Ù… Ø¨Ù‡Ø§"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3513,15 +3615,15 @@
 "Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©.  Ù‡Ø°Ø§ Ø¨Ø±Ù†Ø§Ù…Ø¬ ØØ±ØŒ ÙˆÙ†Ø±ØØ¨ Ø¨Ù‚ÙŠØ§Ù…Ùƒ Ø¨Ø¥Ø¹Ø§Ø¯Ø© ØªÙˆØ²ÙŠØ¹Ø©\n"
 "ÙˆÙÙ‚Ø§Ù‹ Ù„Ø´Ø±ÙˆØ· Ù…Ø¹ÙŠÙ†Ø©Ø› Ø±Ø§Ø¬Ø¹ 'Ø§Ù„Ø±Ø®ØµØ©' Ù„Ù„ØªÙØ§ØµÙŠÙ„."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "Ø§Ù‚Ø±Ø£Ù†ÙŠ"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3529,45 +3631,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Ø§Ø³ØªÙ…Ø±Ø§Ø±"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Ù…Ø¹Ø§ÙŠÙ†Ø© ØªØ«Ø¨ÙŠØª Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ø¹Ø±Ø¶ Ùˆ/Ø£Ùˆ ØªØ¹Ø¯ÙŠÙ„ Ø§Ù„Ø£Ø¹Ù…Ø§Ù„ Ø§Ù„ØªÙŠ Ø³ØªØªÙ…"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Ø³Ø§Ø¨Ù‚"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Ø¨Ø¹Ø¶ Ø§Ù„ØØ²Ù… ÙƒØ§Ù†Øª Ù…Ø¹Ø·ÙˆØ¨Ø© ÙˆØªÙ…Ù‘ Ø¥ØµÙ„Ø§ØÙ‡Ø§."
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3576,23 +3678,23 @@
 "ØªØ«Ø¨ÙŠØª/Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØØ²Ù… Ø¨ØªØ·Ù„Ø¨ ØµÙ„Ø§ØÙŠØ§Øª Ø¥Ø¯Ø§Ø±ÙŠÙ‘Ø©ØŒ ÙˆØ§Ù„ØªÙŠ\n"
 "Ù„Ø§ ØªÙ…Ù„ÙƒÙ‡Ø§ ØØ§Ù„ÙŠÙ‘Ø§Ù‹.  Ù‡Ù„ ØªÙˆØ¯ Ø§Ù„ØªØºÙŠÙ‘Ø± Ø¥Ù„Ù‰ ØØ³Ø§Ø¨ Ø§Ù„Ø¬Ø°Ø±ØŸ\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "ØªØÙˆÙ‘ÙÙ„ Ø¥Ù„Ù‰ Ø¬Ø°Ø±"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Ù„Ø§ ØªØÙˆÙ‘Ù„ Ø¥Ù„Ù‰ Ø¬Ø°Ø±"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "Ù‡Ù†Ø§Ùƒ Ø¹Ù…Ù„ÙŠØ© ØªØØ¯ÙŠØ« Ø£Ùˆ ØªØ«Ø¨ÙŠØª ØØ²Ù… ØªØ¬Ø±ÙŠ ØØ§Ù„ÙŠØ§Ù‹."
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ù„Ù… ÙŠØªÙ…Ù‘ Ø¬Ø¯ÙˆÙ„Ø© ØªØ«Ø¨ÙŠØªØŒ Ø£Ùˆ Ø¥Ø²Ø§Ù„Ø© Ø£Ùˆ ØªØ±Ù‚ÙŠØ© Ø£ÙŠÙ‘Ø© ØØ²Ù…."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3604,7 +3706,7 @@
 "ÙŠÙ…ÙƒÙ† ØªØ±Ù‚ÙŠØ© Ø¨Ø¹Ø¶ Ø§Ù„ØØ²Ù…ØŒ Ø¥Ù„Ø§ Ø£Ù†Ù‘Ùƒ Ù„Ù… ØªØ®ØªØ± ØªØ±Ù‚ÙŠØªÙ‡Ø§.\n"
 "Ø§ÙƒØªØ¨ \"U\" ÙƒÙŠ ØªØØ¶Ù‘Ø± Ø§Ù„ØªØ±Ù‚ÙŠØ©."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3613,99 +3715,112 @@
 "ØªØØ¯ÙŠØ« Ù„ÙˆØ§Ø¦Ø Ø§Ù„ØØ²Ù… Ø¨ØªØ·Ù„Ø¨ ØµÙ„Ø§ØÙŠØ§Øª Ø¥Ø¯Ø§Ø±ÙŠÙ‘Ø©ØŒ ÙˆØ§Ù„ØªÙŠ\n"
 "Ù„Ø§ ØªÙ…Ù„ÙƒÙ‡Ø§ ØØ§Ù„ÙŠÙ‘Ø§Ù‹.  Ù‡Ù„ ØªÙˆØ¯ Ø§Ù„ØªØºÙŠÙ‘Ø± Ø¥Ù„Ù‰ ØØ³Ø§Ø¨ Ø§Ù„Ø¬Ø°Ø±ØŸ\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Ø¥Ø¶Ø§Ø¹Ø© Ø§Ù„ÙˆÙ‚Øª Ø¨Ù…ØØ§ÙˆÙ„Ø© Ø§Ù„Ø¨ØØ« Ø¹Ù† Ø§Ù„Ø£Ù„ØºØ§Ù…"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Ø§Ù„ØªÙ†Ø¸ÙŠÙ Ø£Ø«Ù†Ø§Ø¡ Ø§Ù„Ù‚ÙŠØ§Ù… Ø¨Ø§Ù„ØªÙ†Ø²ÙŠÙ„ ØºÙŠØ± Ù…Ø³Ù…ÙˆØ Ø¨Ù‡"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "ØØ°Ù Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…Ù†Ø²Ù„Ø©"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "ØªÙ… ØØ°Ù Ù…Ù„ÙØ§Øª Ø§Ù„ØØ²Ù… Ø§Ù„Ù…Ù†Ø²Ù„Ø©"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Ù…Ù„ÙØ§Øª Ø§Ù„ØØ²Ù… Ø§Ù„Ù…Ù†Ø²Ù„Ø© Ø§Ù„Ù…Ù„ØºØ§Ø© ØªÙ… ØØ°ÙÙ‡Ø§"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Ø¥Ø¶Ø§Ø¹Ø© Ø§Ù„ÙˆÙ‚Øª Ø¨Ù…ØØ§ÙˆÙ„Ø© Ø§Ù„Ø¨ØØ« Ø¹Ù† Ø§Ù„Ø£Ù„ØºØ§Ù…"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "ØªØ¹Ø°Ø± ÙØªØ %s Ù„Ù„ÙƒØªØ§Ø¨Ø©"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^ØªØ«Ø¨ÙŠØª/Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Ø¥Ø¬Ø±Ø§Ø¡ ÙƒÙ„ Ø¹Ù…Ù„ÙŠØ§Øª Ø§Ù„ØªØ«Ø¨ÙŠØª ÙˆØ§Ù„Ø¥Ø²Ø§Ù„Ø© Ø§Ù„Ù…Ø¤Ø®Ù‘ÙŽØ±Ø©"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^ØªØØ¯ÙŠØ« Ù„Ø§Ø¦ØØ© Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† ÙˆØ¬ÙˆØ¯ Ù†Ø³Ø® Ø¬Ø¯ÙŠØ¯Ø© Ù…Ù† Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Ù†Ø³ÙŠØ§Ù† Ø§Ù„ØØ²Ù… Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Ù†Ø³ÙŠØ§Ù† Ø£ÙŠÙ‘ Ø§Ù„ØØ²Ù… Ù‡ÙŠ \"Ø¬Ø¯ÙŠØ¯Ø©\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^ØªÙ†Ø¸ÙŠÙ Ù…Ø®Ø²Ù† Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "ØØ°Ù Ù…Ù„ÙØ§Øª Ø§Ù„ØØ²Ù… Ø§Ù„ØªÙŠ ØªÙ… ØªÙ†Ø²ÙŠÙ„Ù‡Ø§ Ù…Ù† Ù‚Ø¨Ù„"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "ØØ°Ù Ø§Ù„Ù…Ù„ÙØ§Ø© Ø§Ù„^Ù…Ù„ØºÙŠØ©"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "ØØ°Ù Ù…Ù„ÙØ§Øª Ø§Ù„ØØ²Ù… Ø§Ù„ØªÙŠ Ù„Ø§ ÙŠÙ…ÙƒÙ† ØªÙ†Ø²ÙŠÙ„Ù‡Ø§ Ø¨Ø¹Ø¯ Ø§Ù„Ø¢Ù†"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "ØªØ¹Ù„ÙŠÙ… Ø§Ù„^Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ØªØ±Ù‚ÙŠØ©"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "ØªØ¹Ù„ÙŠÙ… ÙƒÙ„ Ø§Ù„ØØ²Ù… Ø§Ù„Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ØªØ±Ù‚ÙŠØ© ÙˆØ§Ù„ØªÙŠ Ù„ÙŠØ³Øª Ù…Ø¨Ù‚Ø§Ø© Ù„Ù„ØªØ±Ù‚ÙŠØ©"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Ù„Ø¹Ø¨ ÙƒØ§Ù†Ø³Ø© Ø§Ù„Ø£Ù„ØºØ§Ù…"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^ØªØÙˆÙ‘Ù„ Ø¥Ù„Ù‰ Ù…Ø³ØªØ®Ø¯Ù… Ø¬Ø°Ø±"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3714,78 +3829,78 @@
 "Ø§Ø³ØªØ®Ø¯Ù… 'su' ÙƒÙŠ ØªØµØ¨Ø Ù…Ø³ØªØ®Ø¯Ù… Ø¬Ø°Ø±Ø› Ø³ÙŠÙ‚ÙˆÙ… Ù‡Ø°Ø§ Ø¨Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ØŒ ÙˆÙ„ÙƒÙ† Ø³ÙŠØªÙ…\n"
 "Ø§Ù„Ø¥Ø¨Ù‚Ø§Ø¡ Ø¹Ù„Ù‰ Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙƒ"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ…ÙŠÙ„ Ù…Ø®Ø²Ù† Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ…ÙŠÙ„ Ù…Ø®Ø²Ù† Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Ø®Ø±ÙˆØ¬"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Ø§Ù„Ø®Ø±ÙˆØ¬ Ù…Ù† Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "ØªØ±Ø§Ø¬Ø¹"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Ø§Ù„ØªØ±Ø§Ø¬Ø¹ Ø¹Ù† Ø¢Ø®Ø± Ø¹Ù…Ù„ÙŠØ© ØØ²Ù…Ø© Ø£Ùˆ Ù…Ø¬Ù…ÙˆØ¹Ø© Ù…Ù† Ø§Ù„Ø¹Ù…Ù„ÙŠØ§Øª"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^ØªØ«Ø¨ÙŠØª"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "ØªØ¹Ù„ÙŠÙ… Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ø¯Ø© ØØ§Ù„ÙŠØ§Ù‹ Ù„Ù„ØªØ«Ø¨ÙŠØª Ø£Ùˆ Ø§Ù„ØªØ±Ù‚ÙŠØ©"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "Ø¥^Ø²Ø§Ù„Ø©"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "ØªØ¹Ù„ÙŠÙ… Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ø¯Ø© ØØ§Ù„ÙŠØ§Ù‹ Ù„Ù„Ø¥Ø²Ø§Ù„Ø©"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Ø¥Ù„ØºØ§Ø¡"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "ØªØ¹Ù„ÙŠÙ… Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ø¯Ø© ØØ§Ù„ÙŠØ§Ù‹ ÙˆÙ…Ù„ÙØ§Øª ØªÙ‡ÙŠØ¦ØªÙ‡Ø§ Ù„Ù„Ø¥Ø²Ø§Ù„Ø©"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Ù…ØØ§ÙØ¸Ø©"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ø£ÙŠÙ‘ Ø¹Ù…Ù„ Ø¹Ù„Ù‰ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ø¯Ø©"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "Ø¥^Ø¨Ù‚Ø§Ø¡"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ø£ÙŠ Ø¹Ù…Ù„ Ø¹Ù„Ù‰ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ø¯Ø©ØŒ ÙˆØÙ…Ø§ÙŠØªÙ‡Ø§ Ù…Ù† Ø§Ù„ØªØ±Ù‚ÙŠØ§Øª Ø§Ù„Ù…Ø³ØªÙ‚Ø¨Ù„ÙŠÙ‘Ø©"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "ØªØØ¯ÙŠØ¯ ^ØªÙ„Ù‚Ø§Ø¦ÙŠ"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -3794,11 +3909,11 @@
 "ØªØØ¯ÙŠØ¯ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ù‘Ø¯Ø© Ø¹Ù„Ù‰ Ø£Ù†Ù‡Ø§ Ø«ÙØ¨ØªØª ØªÙ„Ù‚Ø§Ø¦ÙŠÙ‘Ø§Ù‹Ø›\n"
 "Ø³ÙˆÙ ÙŠØªÙ… Ø¥Ø²Ø§Ù„ØªÙ‡Ø§ Ø¥Ù† Ù„Ù… ØªØ¹ØªÙ…Ø¯ Ø¹Ù„ÙŠÙ‡Ø§ Ø£ÙŠØ© ØØ²Ù…Ø© Ø£Ø®Ø±Ù‰"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "ØªØØ¯ÙŠØ¯ ^ÙŠØ¯ÙˆÙŠ"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -3807,11 +3922,11 @@
 "ØªØØ¯ÙŠØ¯ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ù‘Ø¯Ø© Ø¹Ù„Ù‰ Ø£Ù†Ù‡Ø§ Ø«ÙØ¨ØªØª ÙŠØ¯ÙˆÙŠÙ‘Ø§Ù‹Ø›\n"
 "Ù„Ù† ÙŠØªÙ… Ø¥Ø²Ø§Ù„ØªÙ‡Ø§ Ø¥Ù„Ø§ Ø¥Ù† Ù‚Ù…Øª Ø¨Ø°Ù„Ùƒ"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Ù…Ù†Ø¹ Ø§Ù„Ù†Ø³Ø®Ø©"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -3820,215 +3935,215 @@
 "Ù…Ù†Ø¹ ØªØ«Ø¨ÙŠØª Ø§Ù„Ù†Ø³Ø®Ø© Ø§Ù„Ù…Ø±Ø´ØØ© Ù…Ù† Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ø¯Ø©Ø›\n"
 "Ø£Ù…Ø§ Ø§Ù„Ù†Ø³Ø® Ø§Ù„Ø£Ø¬Ø¯Ø¯ Ù…Ù† Ø§Ù„ØØ²Ù…Ø© ÙØ³ÙŠØªÙ… ØªØ«Ø¨ÙŠØªÙ‡Ø§ ÙƒØ§Ù„Ø¹Ø§Ø¯Ø©"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "^Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Ø¹Ø±Ø¶ Ù…Ø²ÙŠØ¯ Ù…Ù† Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª ØÙˆÙ„ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ù‘Ø¯Ø©"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Ø³Ø¬Ù„ Ø§Ù„ØªØºÙŠÙŠØ±"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Ø¹Ø±Ø¶ Ø³Ø¬Ù„ ØªØºÙŠÙŠØ± Ø¯Ø¨ÙŠØ§Ù† Ù„Ù„ØØ²Ù…Ø© Ø§Ù„Ù…ØØ¯Ù‘Ø¯Ø©"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Ø¨ØØ«"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Ø§Ù„Ø¨ØØ« Ø¹Ù† ØØ²Ù…Ø©"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Ø§Ù„Ø¨ØØ« ^Ù…Ø¬Ø¯Ù‘Ø¯Ø§Ù‹"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "ØªÙƒØ±Ø§Ø± Ø§Ù„Ø¨ØØ« Ø§Ù„Ø£Ø®ÙŠØ±"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^ØØ¯Ù‘ Ø§Ù„Ø¹Ø±Ø¶"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "ØªØµÙÙŠØ© Ù„Ø§Ø¦ØØ© Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "Ø¥^Ø²Ø§Ù„Ø© ØØ¯Ù‘ Ø§Ù„Ø¹Ø±Ø¶"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØªØµÙÙŠØ© Ù…Ù† Ù„Ø§Ø¦ØØ© Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ ^Ù…Ø¹Ø·ÙˆØ¨Ø©"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„ØªØ§Ù„ÙŠØ© Ø°Ø§Øª Ø§Ù„Ù…Ø¹ØªÙ…Ø¯Ø§Øª Ø§Ù„ØºÙŠØ± Ù…Ø³ØªÙˆÙÙŠØ©"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "Ø®ÙŠØ§Ø±Ø§Øª ^ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "ØªØºÙŠÙŠØ± Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„ØªÙŠ ØªØ¤Ø«Ø± Ø¹Ù„Ù‰ ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "Ø¥^Ø¯Ø§Ø±Ø© Ø§Ù„Ù…Ø¹ØªÙ…Ø¯Ø§Øª"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "ØªØºÙŠÙŠØ± Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„ØªÙŠ ØªØ¤Ø«Ø± Ø¹Ù„Ù‰ ÙƒÙŠÙÙŠØ© Ø§Ù„ØªØ¹Ø§Ù…Ù„ Ù…Ø¹ Ù…Ø¹ØªÙ…Ø¯Ø§Øª Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Ù…ØªÙØ±Ù‚Ø§Øª"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "ØªØºÙŠÙŠØ± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ Ø§Ù„Ù…Ø®ØªÙ„ÙØ©"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù„Ø®ÙŠØ§Ø±Ø§Øª"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Ø¥Ø¹Ø§Ø¯Ø© ÙƒÙ„ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¥Ù„Ù‰ Ø§ÙØªØ±Ø§Ø¶ÙŠÙ‘Ø§Øª Ø§Ù„Ù†Ø¸Ø§Ù…"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^ØªØ§Ù„ÙŠ"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ø´Ø§Ø´Ø© Ø§Ù„ØªØ§Ù„ÙŠØ©"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Ø³Ø§Ø¨Ù‚"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ø´Ø§Ø´Ø© Ø§Ù„Ø³Ø§Ø¨Ù‚Ø©"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Ø¥ØºÙ„Ø§Ù‚"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Ø¥ØºÙ„Ø§Ù‚ Ù‡Ø°Ù‡ Ø§Ù„Ø´Ø§Ø´Ø©"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "^Ø¹Ø±Ø¶ ØØ²Ù… Ø¬Ø¯ÙŠØ¯"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ø¹Ø±Ø¶ ØØ²Ù… Ø§ÙØªØ±Ø§Ø¶ÙŠ Ø¬Ø¯ÙŠØ¯"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "^Ù…Ø³ØªØ¹Ø±Ø¶ ØªØµÙ†ÙŠÙÙŠ Ø¬Ø¯ÙŠØ¯"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Ø§Ø³ØªØ¹Ø±Ø§Ø¶ Ø§Ù„ØØ²Ù… Ø¨ØØ³Ø¨ Ø§Ù„ØµÙ†Ù"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^ØÙˆÙ„"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Ø¹Ø±Ø¶ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª ØÙˆÙ„ Ù‡Ø°Ø§ Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Ù…Ø³Ø§Ø¹Ø¯Ø©"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø© Ø§Ù„ÙÙˆØ±ÙŠØ©"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "Ø¯Ù„ÙŠÙ„ Ø§Ù„^Ù…Ø³ØªØ®Ø¯Ù…"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Ø¹Ø±Ø¶ Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ Ø§Ù„Ù…ÙØµÙ‘Ù„"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Ø¹Ø±Ø¶ Ù„Ø§Ø¦ØØ© Ø¨Ø§Ù„Ø£Ø³Ø¦Ù„Ø© Ø§Ù„Ø£ÙƒØ«Ø± Ø·Ø±ØØ§Ù‹"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Ø¹Ø±Ø¶ Ø§Ù„ØªØºÙŠÙŠØ±Ø§Øª Ø§Ù„Ù…Ù‡Ù…Ø© Ø§Ù„ØªÙŠ ØªÙ…Øª ÙÙŠ ÙƒÙ„ Ù†Ø³Ø®Ø© Ù…Ù† Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Ø§Ù„Ø±Ø®ØµØ©"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ø´Ø±ÙˆØ· Ø§Ù„ØªÙŠ ÙŠÙ…ÙƒÙ†Ùƒ Ù†Ø³Ø® Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ Ø¶Ù…Ù†Ù‡Ø§"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Ø£Ø¹Ù…Ø§Ù„"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Ø¨ØØ«"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Ø®ÙŠØ§Ø±Ø§Øª"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Ø¹Ø±ÙˆØ¶"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Ù…Ø³Ø§Ø¹Ø¯Ø©"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Ù‚Ø§Ø¦Ù…Ø©  %s: Ù…Ø³Ø§Ø¹Ø¯Ø©  %s: Ø®Ø±ÙˆØ¬  %s: ØªØØ¯ÙŠØ«  %s: ØªÙ†Ø²ÙŠÙ„/ØªØ«Ø¨ÙŠØª/Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ØØ²Ù…"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
@@ -4070,13 +4185,53 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ø¢Ø®!  Ù‚Ø§Ø¨Ù„Øª Ø¥Ø´Ø§Ø±Ø© Ø®Ø±ÙˆØ¬ SIGQUITØŒ Ø¬Ø§Ø±ÙŠ Ø§Ù„ØªÙ†ÙÙŠØ°..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ù†Ø¹Ù…"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Ù„Ø§"
+#, fuzzy
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Ø§Ù„Ø£ÙˆØ§Ù…Ø±:\n"
+#~ "  y: Ø§Ù„Ø§Ø³ØªÙ…Ø±Ø§Ø± Ø¨Ø§Ù„ØªØ«Ø¨ÙŠØª\n"
+#~ "  n: Ø§Ù„Ø¥Ø¬Ù‡Ø§Ø¶ ÙˆØ§Ù„Ø®Ø±ÙˆØ¬\n"
+#~ "  i: Ø¥Ø¸Ù‡Ø§Ø± Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª ØÙˆÙ„ ÙˆØ§ØØ¯ Ø£Ùˆ Ø£ÙƒØ«Ø± Ù…Ù† Ø§Ù„ØØ²Ù…\n"
+#~ "     ÙŠØ¬Ø¨ Ø£Ù† ØªØªØ¨Ø¹ Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„ØØ²Ù… Ø§Ù„Ø£Ù…Ø± 'i'.\n"
+#~ "  d: Ø¹ÙƒØ³ Ø¹Ø±Ø¶ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„Ù…Ø¹ØªÙ…Ø¯Ø§Øª\n"
+#~ "  s: Ø¹ÙƒØ³ Ø¹Ø±Ø¶ Ø§Ù„ØªÙ‘ØºÙŠÙ‘Ø±Ø§Øª ÙÙŠ ØØ¬Ù… Ø§Ù„ØØ²Ù…\n"
+#~ "  v: Ø¹ÙƒØ³ Ø¹Ø±Ø¶ Ø§Ù„Ù†Ø³Ø®\n"
+#~ "  e: Ø¯Ø®ÙˆÙ„ Ø§Ù„ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ù…Ø±Ø¦ÙŠØ© Ø§Ù„ÙƒØ§Ù…Ù„Ø©\n"
+#~ "\n"
+#~ "  ÙŠÙ…ÙƒÙ† Ø£ÙŠØ¶Ø§Ù‹ ØªØØ¯ÙŠØ¯ Ø§Ù„ØªØºÙŠÙŠØ±Ø§Øª Ø¹Ù„Ù‰ Ù…Ø¬Ù…ÙˆØ¹Ø© Ø£Ø¹Ù…Ø§Ù„ Ø§Ù„ØØ²Ù….\n"
+#~ "  Ù„Ù„Ù‚ÙŠØ§Ù… Ø¨Ø°Ù„ÙƒØŒ Ø§ÙƒØªØ¨ ØØ±Ù Ø§Ù„Ø£Ù…Ø± Ù…ØªØ¨ÙˆØ¹Ø§Ù‹ Ø¨ÙˆØ§ØØ¯ Ø£Ùˆ Ø£ÙƒØ«Ø± Ù…Ù† Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„ØØ²Ù…\n"
+#~ "Ø£Ùˆ Ø§Ù„ØµÙŠØº.  ÙŠØªÙ…Ù‘ Ø¹Ù†Ø¯Ù‡Ø§ ØªØ·Ø¨ÙŠÙ‚ Ø§Ù„Ø¹Ù…Ù„ Ø¹Ù„Ù‰ ÙƒÙ„ Ø§Ù„ØØ²Ù…. (ÙŠÙ…ÙƒÙ†Ùƒ ØªØØ¯ÙŠØ¯\n"
+#~ "Ø£Ø¹Ù…Ø§Ù„ Ø¥Ø¶Ø§ÙÙŠÙ‘Ø©Ø› ÙŠÙØ·Ø¨Ù‘Ù‚ ÙƒÙ„ Ù…Ù†Ù‡Ø§ Ø¹Ù„Ù‰ Ø§Ù„ØØ²Ù…Ø© Ø§Ù„ØªÙŠ ØªÙ„ÙŠÙ‡Ø§)\n"
+#~ "\n"
+#~ "Ø§Ù„Ø£Ø¹Ù…Ø§Ù„:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-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"
@@ -149,7 +149,7 @@
 msgstr ""
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Uredu"
@@ -281,79 +281,84 @@
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 ""
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:265
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:268
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:294
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:297
+#: 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"
 msgstr ""
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr ""
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -393,7 +398,7 @@
 msgid "Invalid operation %s"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -404,16 +409,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -466,193 +471,316 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 ""
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " ili"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "SlijedeÄ‡i paketi su OÅ TEÄ†ENI:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "SlijedeÄ‡i paketi se ne koriste i biti Ä‡e UKLONJENI:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "SlijedeÄ‡i paketi Ä‡e biti automatski zadrÅ¾ani:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "SlijedeÄ‡i NOVI paketi Ä‡e biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "SlijedeÄ‡i paketi Ä‡e biti automatski UKLONJENI:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Da"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Ne"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, fuzzy, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "SlijedeÄ‡i NOVI paketi Ä‡e biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr ""
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 msgid "Press Return to continue"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Oblik prikaza za poglede paketa"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "Automatski nadogradi instalirane pakete"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "SlijedeÄ‡i NOVI paketi Ä‡e biti automatski instalirani:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+msgid "'-' to remove packages"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+msgid "'_' to purge packages"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+msgid "'=' to place packages on hold"
+msgstr ""
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr "SlijedeÄ‡i NOVI paketi Ä‡e biti automatski instalirani:"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "PreporuÄuje"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -660,7 +788,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -668,7 +796,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +804,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -684,7 +812,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -692,7 +820,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -700,101 +828,98 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 msgid "give up and quit the program"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 msgid "The following actions will resolve these dependencies:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "SlijedeÄ‡i paketi su OÅ TEÄ†ENI:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, c-format
+msgid "Error writing resolver state to %s"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:250
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr ""
@@ -1090,7 +1215,7 @@
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -1365,23 +1490,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr ""
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1644,298 +1764,298 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
 msgstr ""
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -1966,7 +2086,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr ""
 
@@ -2140,7 +2260,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr ""
 
@@ -3310,52 +3430,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr ""
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr ""
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr ""
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr ""
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr ""
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr ""
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
@@ -3363,15 +3483,15 @@
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr ""
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr ""
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3379,479 +3499,492 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 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:1073
+#: src/ui.cc:1074
 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:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, c-format
+msgid "Unable to open %s"
+msgstr ""
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 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:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 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:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 #, fuzzy
 msgid "^Changelog"
 msgstr "PoniÅ¡ti"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 #, fuzzy
 msgid "Remove the filter from the package list"
 msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Opcije"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr ""
 
@@ -3893,14 +4026,6 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr ""
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Da"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Ne"
-
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Deixeu-me tranquil, estic intentant pensar.\n"
 

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-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"
@@ -163,7 +163,7 @@
 "aquest filtre"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "D'acord"
@@ -306,47 +306,47 @@
 "Nota: s'estÃ  seleccionant \"%s\" en comptes del\n"
 "      paquet virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "La versiÃ³ solÂ·licitada (%s) de %s ja estÃ  instalÂ·lada\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "El paquet %s no estÃ  instalÂ·lat, no es tornarÃ  a instalÂ·lar.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "El paquet %s no estÃ  instalÂ·lat, no se suprimirÃ \n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "El paquet %s no estÃ  instalÂ·lat, no es pot prohibir l'actualitzaciÃ³\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "El paquet %s no Ã©s actualitzable, no es pot prohibir l'actualitzaciÃ³\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Nota: s'estÃ  seleccionant la tasca \"%s: %s\" per a la instalÂ·laciÃ³\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "En una ordre 'install' nomÃ©s podeu especificar una versiÃ³ de paquet.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "En una ordre 'install' nomÃ©s podeu especificar un arxiu.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -355,7 +355,7 @@
 "No s'ha pogut trobar el paquet \"%s\" i el nom de mÃ©s\n"
 "de 40 paquets contÃ© \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -364,14 +364,14 @@
 "No s'ha pogut trobar el paquet \"%s\". Tot i aixÃ², el nom dels\n"
 "segÃ¼ents paquets contÃ© \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "No s'ha pogut trobar cap paquet amb un nom o descripciÃ³ que coincideixi amb "
 "\"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -380,7 +380,7 @@
 "No s'ha pogut trobar cap paquet que coincideixi amb \"%s\". MÃ©s de 40\n"
 "paquets contenen \"%s\" en la descripciÃ³.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -389,6 +389,11 @@
 "No s'ha pogut trobar cap paquet que coincideixi amb \"%s\". Tot i aixÃ², la\n"
 "descripciÃ³ dels segÃ¼ents paquets contÃ© \"%s\":\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "El carÃ cter d'acciÃ³ '%c' Ã©s erroni\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -431,7 +436,7 @@
 msgid "Invalid operation %s"
 msgstr "L'operaciÃ³ %s no Ã©s vÃ lida"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -442,16 +447,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "baixa: heu d'especificar un mÃnim d'un paquet a baixar\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "No s'ha pogut llegir la llista de fonts"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "No es pot trobar un paquet anomenat \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -506,95 +511,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "QuÃ¨ Ã©s aixÃ²?  Evidentment Ã©s una serp menjant-se un elefant.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "No s'ha pogut llegir la llista de fonts"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "perÃ² el %s estÃ  per instalÂ·lar."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "perÃ² el %s estÃ  instaÂ·lat i apartat."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "perÃ² el %s estÃ  instalÂ·lat."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "perÃ² no es pot instalÂ·lar."
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " que Ã©s un paquet virtual."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " o"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Els paquets segÃ¼ents contenen errors."
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Els paquets segÃ¼ents no s'utilitzen i se suprimiran:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Els paquets segÃ¼ents s'han apartat automÃ ticament:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Els paquets nous segÃ¼ents s'instalÂ·laran automÃ ticament:<"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Els paquets segÃ¼ents se suprimiran automÃ ticament:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Els paquets segÃ¼ents es desactualitzaran:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Els paquets segÃ¼ents s'han apartat:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Els paquets segÃ¼ents es tornaran a instalÂ·lar:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Els paquets nous segÃ¼ents s'instalÂ·laran:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Els paquets segÃ¼ents se suprimiran:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Els paquets segÃ¼ents s'actualitzaran:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Els paquets essencials segÃ¼ents se suprimiran\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Els paquets essencials segÃ¼ents contindran errors arran de l'acciÃ³:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -604,103 +609,230 @@
 "sistema.\n"
 "      No contineu si no coneixeu exactament el que esteu fent.\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "SÃ³c conscient que no Ã©s una bona idea"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Per continuar introduÃ¯u la frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "SÃ"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "No"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Per continuar introduÃ¯u la frase \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Els paquets segÃ¼ents sÃ³n RECOMANATS perÃ² NO s'instalÂ·laran:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Els paquets segÃ¼ents sÃ³n un SUGGERIMENT perÃ² NO s'instalÂ·laran:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "No s'instalÂ·larÃ , actualitzarÃ  o suprimirÃ  cap paquet.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquets actualitzats, %lu instalÂ·lats, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu tornats a instalÂ·lar, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualitzats, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a suprimir i %lu a no actualitzar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Es necessita obtenir %sB/%sB d'arxius. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Es necessita obtenir %sB d'arxius. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "DesprÃ©s del desempaquetat s'utilitzaran %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "DesprÃ©s del desempaquetat s'alliberaran %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "El carÃ cter d'acciÃ³ '%c' Ã©s erroni\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "No s'ha trobat cap paquet a mostrar -- introduÃ¯u els noms dels paquets a la "
 "lÃnia posterior a 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Per continuar premeu la tecla de retorn."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "No s'ha trobat cap paquet -- introduÃ¯u els noms dels paquets a la lÃnia "
 "posterior a 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Per continuar premeu la tecla de retorn."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "El format de visualitzaciÃ³ per a les vistes de paquets"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^InstalÂ·la/suprimeix els paquets"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Els paquets nous segÃ¼ents s'instalÂ·laran automÃ ticament:<"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^InstalÂ·la/suprimeix els paquets"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Oblida els paquets nous"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold          - Deixa els paquets congelats\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto      - Marca els paquets com a instalÂ·lats automÃ ticament\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto    - Marca els paquets com a instalÂ·lats manualment\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "recomana"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Esteu segur de voler continuar? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -711,7 +843,7 @@
 "Es mostrarÃ  la informaciÃ³ de les dependÃ¨ncies.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -722,7 +854,7 @@
 "No es mostrarÃ  la informaciÃ³ de les dependÃ¨ncies.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -733,7 +865,7 @@
 "Es mostraran les versions.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -744,7 +876,7 @@
 "No es mostraran les versions.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -755,7 +887,7 @@
 "Es mostraran els canvis de mides.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -766,131 +898,105 @@
 "No es mostraran els canvis de mides.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Ordres:\n"
-"  y: continua la instalÂ·laciÃ³\n"
-"  n: abandona i surt\n"
-"  i: mostra informaciÃ³ sobre un o mÃ©s paquets;\n"
-"     els noms dels paquets han d'anar seguint la 'i'\n"
-"  c: mostra els registres de modificaciÃ³ de Debian d'un o mÃ©s paquets;\n"
-"     els noms dels paquets han d'anar seguint la 'c'\n"
-"  d: commuta la visualitzaciÃ³ de la informaciÃ³ de les dependÃ¨ncies\n"
-"  s: commuta la visualitzaciÃ³ dels canvis en les mides dels paquets\n"
-"  v: commuta la visualitzaciÃ³ de les versions\n"
-"  e: utilitza la interfÃcie visual completa\n"
-"\n"
-"  TambÃ© haurÃeu d'especificar les modificacions al conjunt d'accions dels "
-"paquets.\n"
-"  Escriviu un carÃ cter d'acciÃ³ seguit d'un o mÃ©s noms o patrons de paquets. "
-"L'acciÃ³ s'aplicarÃ  a tots els paquets (haurÃeu d'especificar les accions "
-"addicionals; cada una s'aplicarÃ  al conjunt de paquets que la segueixin).\n"
-"  \n"
-"Accions:\n"
-"  + : instalÂ·la\n"
-"  - : suprimeix\n"
-"  _ : purga\n"
-"  = : congela\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "La resposta no Ã©s vÃ lid. IntroduÃ¯u una ordre vÃ lid o '?' per a ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Surt del programa"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, 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:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Els paquets segÃ¼ents contenen errors."
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, 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
 #, 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:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, 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:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1187,7 +1293,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "S'estan suprimint els fitxers baixats obsolets"
 
@@ -1480,26 +1586,21 @@
 "No s'han pogut resoldre les dependÃ¨ncies, alguns paquets no es poden "
 "instalÂ·lar"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de fonts."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Probablement voldreu actualitzar la llista de paquets per resoldre els "
 "problemes amb els fitxers que falten."
 
-#: 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/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1790,17 +1891,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "El tipus de polÃtica d'ordenaciÃ³ '%s' Ã©s invÃ lid"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilat el %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1809,7 +1910,7 @@
 "\n"
 "VersiÃ³ de les NCurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1818,22 +1919,22 @@
 "\n"
 "VersiÃ³ de les Curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "versiÃ³ de la libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "UtilitzaciÃ³: aptitude [-S nomfitxer] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "      aptitude [opcions] <acciÃ³> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1843,44 +1944,44 @@
 "interactiu):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install       - InstalÂ·la/actualitza els paquets\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove        - Suprimeix els paquets\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 " purge          - Suprimeix els paquets i els corresponents fitxers de "
 "configuraciÃ³\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold          - Deixa els paquets congelats\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold        - CancelÂ·la l'ordre de congelaciÃ³ d'un paquet\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto      - Marca els paquets com a instalÂ·lats automÃ ticament\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto    - Marca els paquets com a instalÂ·lats manualment\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1889,17 +1990,17 @@
 " forbid-version - Prohibeix l'actualitzaciÃ³ a una versiÃ³ especÃfica d'un "
 "paquet.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update        - Baixa les llistes dels paquets nous/actualitzables\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrades      - Realitza una actualitzaciÃ³ segura\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1908,75 +2009,75 @@
 " dist-upgrade  - Realitza una actualitzaciÃ³, probablement instalÂ·lant i "
 "suprimint paquets\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-net     - Oblida quins paquets sÃ³n \"nous\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search        - Cerca un paquet pel seu nom i/o expressiÃ³\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " mostra        - Mostra informaciÃ³ detallada d'un paquet\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean         - Suprimeix els fitxers dels paquets baixats\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean     - Suprimeix els fitxers dels paquets baixats antics\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Visualitza un registre de modificacions d'un paquet\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download      - Baixa el fitxer .deb d'un paquet\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opcions:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Aquest text d'ajuda\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simula les accions perÃ² no les duguis a terme.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d          Baixa els paquets perÃ² n'instalÂ·lis o suprimeixis cap.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Pregunta permanentment les confirmacions o accions\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 " -y             Assumeix que la resposta a les preguntes sÃ/noo Ã©s 'sÃ'\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1985,7 +2086,7 @@
 " -F format      Especifica un format per a la visualitzaciÃ³ dels resultats "
 "de la cerca; fes una ullada al manual\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1993,7 +2094,7 @@
 " -O ordre       Especifica el mode en que s'han d'ordenar els resultats de "
 "la cerca, fes una ullada al manual\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -2001,17 +2102,17 @@
 " -w amplada      Especifica l'amplada de la visualitzaciÃ³ pel formatat dels "
 "resultats de la cerca\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f       Intent agressiu de resoldre els errors dels paquets.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V           Mostra les versions dels programes a instalÂ·lar.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -2019,18 +2120,18 @@
 " -D           Mostra les dependÃ¨ncies dels paquets modificats "
 "automÃ ticament.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z     Mostra els canvis de la mida instalÂ·lada per a cada paquet.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v       Mostra la informaciÃ³ extra. (s'utilitza mÃºltiples vegades)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -2038,12 +2139,12 @@
 " -t [versiÃ³]   Especifica la versiÃ³ de llanÃ§ament de la qual s'haurien "
 "d'instalÂ·lar les paquets\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o clau=val   Defineix directament l'opciÃ³ de configuraciÃ³ 'clau'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2053,65 +2154,65 @@
 "recomanacions com\n"
 "                dependÃ¨ncies fortes\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S nomf: Llegeix la informaciÃ³ d'estat estesa de l'aptitude del nom.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u       : Baixa una nova llista de paquets a l'inici.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr "-i          : Executa la instalÂ·laciÃ³ a l'inici.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  L'aptitude no tÃ© super poders bovins.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o precisa d'un argument del tipus clau=valor, s'ha obtingut %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "Rar: s'ha rebut un codi d'opciÃ³ desconegut\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "NomÃ©s es pot utilitzar un -u o -i\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u i -i no es poden utilitzar en el mode de lÃnia d'ordres (ex, amb "
 "'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u i -i no s'han d'utilitzar amb una ordre"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ordre desconeguda \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2142,7 +2243,7 @@
 msgid "Lost"
 msgstr "Perdut"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Busca mines"
 
@@ -2318,7 +2419,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paquet"
 
@@ -3811,56 +3912,56 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Er, no s'ha produÃ¯t cap error, aquesta situaciÃ³ no s'hauria de donar.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Cerca:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Ja sou el superusuari"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Els subprocÃ©s ha finalitzat amb un error -- heu introduÃ¯t correctament la "
 "contrasenya?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "S'estÃ  carregant la memÃ²ria cau"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Esteu segur de voler sortir de l'Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Esteu segur de voler descartar els vostres parÃ metres personals i utilitzar "
 "els predeterminats?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Paquets"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Observeu els paquets disponibles i escolliu les accions a realitzar"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3878,15 +3979,15 @@
 "podeu redistribuir acceptant una seguit de termes dels quals podeu trobar "
 "mÃ©s informaciÃ³ a 'llicÃ¨ncia'."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3894,45 +3995,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continua"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "PrevisualitzaciÃ³ de la instalÂ·laciÃ³ de paquets"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Ante"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns paquets contenien errors i s'han arreglat"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3942,23 +4043,23 @@
 "d'administrador,\n"
 "els quals actualment no teniu. Voleu canviar al compte de superusuari?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "EsdevÃ© superusuari"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "No esdevinguis superusuari"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "No s'instalÂ·larÃ , actualitzarÃ  o suprimirÃ  cap paquet."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3970,7 +4071,7 @@
 "Alguns paquets es podrien actualitzar, perÃ² no heu escollit fer-ho.\n"
 "Premeu \"U\" per preparar-ne una actualitzaciÃ³."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3979,102 +4080,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:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "S'estan suprimint els fitxers baixats"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "S'han suprimit els fitxers dels paquets baixats"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, 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:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, 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:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "No s'ha pogut obrir %s per a l'escriptura"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^InstalÂ·la/suprimeix els paquets"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Realitza totes les instalÂ·lacions i supressions pendents"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "Act^ualitza la llista de paquets"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Verifica si hi ha noves versions dels paquets"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Oblida els paquets nous"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Oblida quins paquets sÃ³n \"nous\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "Neteja la memÃ²ria ^cau dels paquets"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Suprimeix els fitxers dels paquets prÃ¨viament baixats"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Neteja els fitxers ^obsolets"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Marca com a ^actualitzable"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Juga al busca mines"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Sigues superusuari"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4083,72 +4197,72 @@
 "Executeu l'ordre 'su' per ser superusuari. Aquesta ordre reinicia el "
 "programa perÃ² mantÃ© els parÃ metres personals."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Recarrega la memÃ²ria cau dels paquets"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Torna a carregar la memÃ²ria cau dels paquets"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "Su^rt"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "DesfÃ©s"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^InstalÂ·la"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 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:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "Sup^rimeix"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Senyala els paquets seleccionats per a la corresponent supressiÃ³"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Purga"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "Man^tÃ©"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "CancelÂ·la qualsevol acciÃ³ al paquet seleccionat"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "Con^gela"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4156,11 +4270,11 @@
 "CancelÂ·la qualsevol acciÃ³ al paquet seleccionat i protegeix-lo de futures "
 "actualitzacions"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Marca ^AutomÃ tic"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4169,11 +4283,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:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Marca ^Manual"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4182,11 +4296,11 @@
 "Marca els paquets seleccionats com a instalÂ·lats manualment;\n"
 "no se suprimiran si no ho feu vosaltres manualment"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Prohibeix la versiÃ³"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4195,207 +4309,207 @@
 "Prohibeix la instalÂ·laciÃ³ de la versiÃ³ candidata del paquet seleccionat;\n"
 "les noves versions del paquet s'instalÂ·laran"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformaciÃ³"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Mostra mÃ©s informaciÃ³ dels paquets seleccionats"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "Registre de modifi^cacions"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Mostra el registre de modificacions de Debian dels paquets seleccionats"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Cerca"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Cerca un paquet"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Torna a cerc^ar"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Repeteix l'Ãºltima cerca"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Limita la visualitzaciÃ³"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Aplica un filtre a la llista de paquets"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "No limits la vis^ualitzaciÃ³"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Suprimeix el filtre de la llista de paquets"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "C^erca els trencats"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Cerca el segÃ¼ent paquet amb dependÃ¨ncies no resoltes"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "Opcions de l'I^U"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Canvia els parÃ metres relacionats amb la interfÃcie d'usuari"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "GestiÃ³ de les ^dependÃ¨ncies"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Diversos"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Canvia diversos parÃ metres de programa"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Recupera les opcions"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Reinicia tots els parÃ metres als predeterminats del sistema"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "SegÃ¼e^nt"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Mostra la visualitzaciÃ³ segÃ¼ent"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Ante"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Mostra la visualitzaciÃ³ anterior"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "Tan^ca"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Tanca aquesta visualitzaciÃ³"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Nova ^vista de paquets"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Crea una nova vista de paquets predeterminada"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Nou na^vegador per categories"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Navega pels paquets per categories"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "Qu^ant a"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Mostra la informaciÃ³ sobre aquest programa"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "A^juda"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Mostra la informaciÃ³ en lÃnia"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Manual d'usuari"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Mostra el manual detallat del programa"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "PM^F"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Mostra una llista de les preguntes mÃ©s freqÃ¼ents"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, 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:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^LlicÃ¨ncia"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Accions"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Opcions"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Vistes"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4403,11 +4517,11 @@
 "%s: MenÃº  %s: Ajuda  %s: Surt  %s: Actualitza  %s: Baixa/InstalÂ·la/Suprimeix "
 "Paquets"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
@@ -4451,13 +4565,56 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Uix!  s'ha obtingut un SIGQUIT, s'estÃ  morint..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "SÃ"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "No"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Ordres:\n"
+#~ "  y: continua la instalÂ·laciÃ³\n"
+#~ "  n: abandona i surt\n"
+#~ "  i: mostra informaciÃ³ sobre un o mÃ©s paquets;\n"
+#~ "     els noms dels paquets han d'anar seguint la 'i'\n"
+#~ "  c: mostra els registres de modificaciÃ³ de Debian d'un o mÃ©s paquets;\n"
+#~ "     els noms dels paquets han d'anar seguint la 'c'\n"
+#~ "  d: commuta la visualitzaciÃ³ de la informaciÃ³ de les dependÃ¨ncies\n"
+#~ "  s: commuta la visualitzaciÃ³ dels canvis en les mides dels paquets\n"
+#~ "  v: commuta la visualitzaciÃ³ de les versions\n"
+#~ "  e: utilitza la interfÃcie visual completa\n"
+#~ "\n"
+#~ "  TambÃ© haurÃeu d'especificar les modificacions al conjunt d'accions dels "
+#~ "paquets.\n"
+#~ "  Escriviu un carÃ cter d'acciÃ³ seguit d'un o mÃ©s noms o patrons de "
+#~ "paquets. L'acciÃ³ s'aplicarÃ  a tots els paquets (haurÃeu d'especificar les "
+#~ "accions addicionals; cada una s'aplicarÃ  al conjunt de paquets que la "
+#~ "segueixin).\n"
+#~ "  \n"
+#~ "Accions:\n"
+#~ "  + : instalÂ·la\n"
+#~ "  - : suprimeix\n"
+#~ "  _ : purga\n"
+#~ "  = : congela\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-10-02 10:13+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <provoz at debian.cz>\n"
@@ -149,7 +149,7 @@
 msgstr "Automaticky odstranit nepouÅ¾ÃvanÃ© balÃky splÅˆujÃcÃ filtr"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -292,47 +292,47 @@
 "Pozn: vybÃrÃ¡m \"%s\" mÃsto\n"
 "      virtuÃ¡lnÃho balÃku \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s je jiÅ¾ instalovÃ¡n v poÅ¾adovanÃ© verzi (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s nenÃ nainstalovÃ¡n, tudÃÅ¾ nebude reinstalovÃ¡n.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "BalÃk %s nenÃ nainstalovÃ¡n, nebude tedy odstranÄ›n\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "BalÃk %s nenÃ nainstalovÃ¡n, nelze tedy zakÃ¡zat aktualizaci\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "BalÃk %s nenÃ aktualizovatelnÃ½, nelze tedy zakÃ¡zat aktualizaci\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Pozn: vybÃrÃ¡m pro instalaci Ãºlohu \"%s: %s\"\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Verzi balÃku mÅ¯Å¾ete zadat jen s pÅ™Ãkazem 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Archiv balÃku mÅ¯Å¾ete zadat jen s pÅ™Ãkazem 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -341,7 +341,7 @@
 "Nemohl jsem najÃt balÃk \"%s\" a vÃce neÅ¾ 40\n"
 "balÃkÅ¯ obsahuje \"%s\" ve svÃ©m nÃ¡zvu.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -350,12 +350,12 @@
 "Nemohl jsem najÃt balÃk \"%s\", ale nÃ¡sledujÃcÃ balÃky\n"
 "obsahujÃ \"%s\" ve svÃ©m nÃ¡zvu:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Nemohl jsem najÃt balÃk, jehoÅ¾ nÃ¡zev nebo popis se shoduje s \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -364,7 +364,7 @@
 "Nemohl jsem najÃt balÃk vyhovujÃcÃ \"%s\" a vÃce neÅ¾ 40\n"
 "balÃkÅ¯ obsahuje \"%s\" ve svÃ©m popisu.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -373,6 +373,11 @@
 "Nemohl jsem najÃt balÃk vyhovujÃcÃ \"%s\", ale nÃ¡sledujÃcÃ balÃky\n"
 "obsahujÃ \"%s\" ve svÃ©m popisu:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "ChybnÃ¡ akce '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Nemohu spustit sensible-pager - je tento Debian vÅ¯bec funkÄnÃ?"
@@ -412,7 +417,7 @@
 msgid "Invalid operation %s"
 msgstr "NeplatnÃ¡ operace %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -423,16 +428,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "download: musÃte zadat alespoÅˆ jeden balÃk ke staÅ¾enÃ\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Nemohu ÄÃst seznam zdrojÅ¯"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Nemohu najÃt balÃk nazvanÃ½ \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -488,95 +493,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Co to je? Co by to bylo! PÅ™ece had Å¾eroucÃ slona.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Nemohu ÄÃst seznam zdrojÅ¯"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "ale %s se bude instalovat."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "ale %s je nainstalovÃ¡n a je podrÅ¾en v aktuÃ¡lnÃm stavu."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ale %s nenÃ instalovanÃ½."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "ale nedÃ¡ se nainstalovat"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " coÅ¾ je virtuÃ¡lnÃ balÃk."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " nebo"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "NÃ¡sledujÃcÃ balÃky jsou POÅ KOZENY:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "NÃ¡sledujÃcÃ balÃky jsou nepouÅ¾ÃvanÃ© a budou ODSTRANÄšNY:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "NÃ¡sledujÃcÃ balÃky jsou automaticky podrÅ¾eny v aktuÃ¡lnÃm stavu:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "NÃ¡sledujÃcÃ NOVÃ‰ balÃky budou nainstalovÃ¡ny automaticky:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "NÃ¡sledujÃcÃ balÃky budou automaticky ODSTRANÄšNY:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "NÃ¡sledujÃcÃ balÃky budou DEGRADOVÃNY:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "NÃ¡sledujÃcÃ balÃky jsou podrÅ¾eny v aktuÃ¡lnÃm stavu:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "NÃ¡sledujÃcÃ balÃky budou reinstalovÃ¡ny:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "NÃ¡sledujÃcÃ NOVÃ‰ balÃky budou instalovÃ¡ny:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "NÃ¡sledujÃcÃ balÃky budou ODSTRANÄšNY:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "NÃ¡sledujÃcÃ balÃky budou aktualizovÃ¡ny:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "NÃ¡sledujÃcÃ NEZBYTNÃ‰ balÃky budou ODSTRANÄšNY!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "NÃ¡sledujÃcÃ NEZBYTNÃ‰ balÃky budou touto akcÃ PORUÅ ENY:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -585,99 +590,226 @@
 "VAROVÃNÃ: ProvedenÃm tÃ©to akce pravdÄ›podobnÄ› poÅ¡kodÃte systÃ©m!\n"
 "          Pokud PÅ˜ESNÄš nevÃte, co dÄ›lÃ¡te, NEPOKRAÄŒUJTE!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Jsem si vÄ›dom, Å¾e to je Å¡patnÃ½ nÃ¡pad"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Pro pokraÄovÃ¡nÃ napiÅ¡te frÃ¡zi \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ano"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Ne"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Pro pokraÄovÃ¡nÃ napiÅ¡te frÃ¡zi \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "NÃ¡sledujÃcÃ balÃky jsou DOPORUÄŒENÃ‰, ale NEBUDOU instalovÃ¡ny:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "NÃ¡sledujÃcÃ balÃky jsou NAVRHOVANÃ‰, ale NEBUDOU instalovÃ¡ny:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Å½Ã¡dnÃ© balÃky se nebudou instalovat, aktualizovat nebo odstraÅˆovat.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu balÃkÅ¯ aktualizovÃ¡no, %lu novÄ› instalovÃ¡no, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalovÃ¡no, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradovÃ¡no, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu k odstranÄ›nÃ a %lu neaktualizovÃ¡no.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "PotÅ™ebuji stÃ¡hnout %sB/%sB archivÅ¯. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "PotÅ™ebuji stÃ¡hnout %sB archivÅ¯. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Po rozbalenÃ bude pouÅ¾ito %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Po rozbalenÃ bude uvolnÄ›no %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "ChybnÃ¡ akce '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "NenÃ co zobrazit -- zadejte nÃ¡zvy balÃkÅ¯ na Å™Ã¡dek za 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Pro pokraÄovÃ¡nÃ stisknÄ›te Enter."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Å½Ã¡dnÃ© balÃky nenalezeny -- zadejte nÃ¡zvy balÃkÅ¯ na Å™Ã¡dek za 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Pro pokraÄovÃ¡nÃ stisknÄ›te Enter."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "FormÃ¡t pro zobrazenÃ balÃkÅ¯"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Instalovat/odstranit balÃky"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "NÃ¡sledujÃcÃ NOVÃ‰ balÃky budou nainstalovÃ¡ny automaticky:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Instalovat/odstranit balÃky"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Zapomenout novÃ© balÃky"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - OchrÃ¡nÃ balÃky pÅ™ed aktualizacÃ\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - OznaÄÃ balÃky, jako Å¾e byly instalovÃ¡ny automaticky\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - OznaÄÃ balÃky, jako Å¾e byly instalovÃ¡ny ruÄnÄ›\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "doporuÄuje"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Chcete pokraÄovat? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -688,7 +820,7 @@
 "Informace o zÃ¡vislostech budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -699,7 +831,7 @@
 "Informace o zÃ¡vislostech nebudou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -710,7 +842,7 @@
 "Verze budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -721,7 +853,7 @@
 "Verze nebudou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -732,7 +864,7 @@
 "ZmÄ›ny velikostÃ budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -743,127 +875,102 @@
 "ZmÄ›ny velikostÃ nebudou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"PÅ™Ãkazy:\n"
-"  y: pokraÄovat v instalaci\n"
-"  n: pÅ™eruÅ¡it a skonÄit\n"
-"  i: zobrazÃ informace o balÃcÃch, jejichÅ¾ nÃ¡zvy\n"
-"     nÃ¡sledujÃ za 'i'.\n"
-"  c: zobrazÃ seznamy zmÄ›n, kterÃ© provedli sprÃ¡vci balÃkÅ¯;\n"
-"     nÃ¡zvy balÃkÅ¯ uveÄte za 'c'\n"
-"  d: zapne/vypne zobrazenÃ informacÃ o zÃ¡vislostech\n"
-"  s: zapne/vypne zobrazenÃ zmÄ›n ve velikostech balÃkÅ¯\n"
-"  v: zapne/vypne zobrazenÃ verzÃ\n"
-"  e: vstoupit do plnÄ› vizuÃ¡lnÃho rozhranÃ\n"
-"\n"
-"  TakÃ© mÅ¯Å¾ete zadat dodateÄnÃ© akce nad balÃky:\n"
-"  NapiÅ¡te znak akce nÃ¡sledovanÃ½ jednÃm nebo vÃce nÃ¡zvy balÃkÅ¯ nebo vzorÅ¯.\n"
-"Akce se provede na vÅ¡ech zadanÃ½ch balÃcÃch. (MÅ¯Å¾ete zadat i vÃce akcÃ,\n"
-"kaÅ¾dÃ¡ se vztahuje na balÃky, kterÃ© ji nÃ¡sledujÃ.)\n"
-"\n"
-"Akce:\n"
-"  + : Instalace\n"
-"  - : OdstranÄ›nÃ\n"
-"  _ : OdstranÄ›nÃ i s konfiguracÃ\n"
-"  = : PodrÅ¾enÃ v aktuÃ¡lnÃm stavu\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "ChybnÃ¡ odpovÄ›Ä. Zadejte platnÃ½ pÅ™Ãkaz nebo '?' pro nÃ¡povÄ›du.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "UkonÄÃ program"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "NÃ¡sledujÃcÃ balÃky majÃ nesplnÄ›nÃ© zÃ¡vislosti:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "NÃ¡sledujÃcÃ balÃky jsou POÅ KOZENY:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Chyba pÅ™i zÃ¡pisu stavovÃ©ho souboru"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "ChybnÃ¡ odpovÄ›Ä. Zadejte platnÃ½ pÅ™Ãkaz nebo '?' pro nÃ¡povÄ›du.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "ChybnÃ¡ odpovÄ›Ä. Zadejte platnÃ½ pÅ™Ãkaz nebo '?' pro nÃ¡povÄ›du.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "hledÃ¡nÃ: MusÃte zadat alespoÅˆ jeden hledanÃ½ term\n"
@@ -1158,7 +1265,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "MaÅ¾u starÃ© staÅ¾enÃ© soubory"
 
@@ -1440,23 +1547,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Nemohu opravit zÃ¡vislosti, nÄ›kterÃ© balÃky nemohou bÃ½t nainstalovÃ¡ny"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Nelze pÅ™eÄÃst seznam zdrojÅ¯."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Seznamy balÃkÅ¯ nebo stavovÃ½ soubor nelze otevÅ™Ãt nebo zpracovat."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "Pro opravenÃ chybÄ›jÃcÃch souborÅ¯ zkuste aktualizovat seznamy balÃkÅ¯"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Nemohu otevÅ™Ãt %s pro zÃ¡pis"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1725,17 +1827,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "NeplatnÃ½ tÅ™ÃdÃcÃ mechanizmus '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s zkompilovÃ¡n %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "KompilÃ¡tor: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1744,7 +1846,7 @@
 "\n"
 "Verze ncurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1753,22 +1855,22 @@
 "\n"
 "Verze curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "verze libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "PouÅ¾itÃ: aptitude [-S nÃ¡zsoub] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [volby] <akce> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1777,42 +1879,42 @@
 "  Akce (pokud nejsou zadÃ¡ny, aptitude spustÃ interaktivnÃ reÅ¾im):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Instaluje/aktualizuje balÃky\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - OdstranÃ balÃky\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - OdstranÃ balÃky a jejich konfiguraÄnÃ soubory\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - OchrÃ¡nÃ balÃky pÅ™ed aktualizacÃ\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - ZruÅ¡Ã ochranu balÃku pÅ™ed aktualizacÃ\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - OznaÄÃ balÃky, jako Å¾e byly instalovÃ¡ny automaticky\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - OznaÄÃ balÃky, jako Å¾e byly instalovÃ¡ny ruÄnÄ›\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1820,17 +1922,17 @@
 msgstr ""
 " forbid-version - ZakÃ¡Å¾e aptitude aktualizaci na konkrÃ©tnÃ verzi balÃku.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - StÃ¡hne seznamy novÃ½ch/aktualizovatelnÃ½ch balÃkÅ¯\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Provede bezpeÄnou aktualizaci\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1839,75 +1941,75 @@
 " dist-upgrade - Provede aktualizaci, pÅ™i kterÃ© moÅ¾nÃ¡ (na|od)instaluje "
 "balÃky\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Zapomene, kterÃ© balÃky jsou \"novÃ©\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - HledÃ¡ balÃky podle jmÃ©na a/nebo vÃ½razu\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - ZobrazÃ podrobnÃ© informace o balÃku\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - SmaÅ¾e staÅ¾enÃ© .deb soubory balÃkÅ¯\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - SmaÅ¾e starÃ© staÅ¾enÃ© .deb soubory balÃkÅ¯\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - ZobrazÃ seznam zmÄ›n balÃku\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - StÃ¡hne .deb soubor balÃku\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Volby:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Tato nÃ¡povÄ›da\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Pouze simuluje, nic reÃ¡lnÄ› neprovÃ¡dÃ.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             StÃ¡hne balÃky, ale nic neinstaluje nebo neodstraÅˆuje.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             VÅ¾dy vyÅ¾aduje potvrzenÃ akcÃ\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             Na jednoduchÃ© ano/ne otÃ¡zky odpovÃ automaticky 'ano'\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1915,60 +2017,60 @@
 msgstr ""
 " -F formÃ¡t      Zadejte formÃ¡t pro zobrazenÃ vÃ½sledkÅ¯ hledÃ¡nÃ; viz manuÃ¡l\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 " -O Å™azenÃ      Zadejte, jak se majÃ vÃ½sledky hledÃ¡nÃ seÅ™adit; viz manuÃ¡l\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w Å¡ÃÅ™ka       Zadejte Å¡ÃÅ™ku zobrazenÃ vÃ½sledkÅ¯ hledÃ¡nÃ\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             AgresivnÄ› zkusÃ opravit poÅ¡kozenÃ© balÃky.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             ZobrazÃ verze balÃkÅ¯, kterÃ© se majÃ instalovat.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             ZobrazÃ zÃ¡vislosti automaticky zmÄ›nÄ›nÃ½ch balÃkÅ¯.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    ZobrazÃ zmÄ›nu v instalovanÃ© velikosti kaÅ¾dÃ©ho balÃku.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 " -v             ZobrazÃ dodateÄnÃ© informace. (MÅ¯Å¾ete zadat nÄ›kolikrÃ¡t.)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 " -t [verze]     Vybere verzi Debianu, ze kterÃ© se majÃ balÃky instalovat\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o klÃÄ=hodn   NastavÃ konfiguraÄnÃ volbu nazvanou 'klÃÄ'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1977,62 +2079,62 @@
 " --with(out)-recommends\tNastavÃ, zda se majÃ doporuÄenÃ© zÃ¡vislosti\n"
 "                brÃ¡t jako silnÃ© zÃ¡vislosti\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S jmsou: NaÄÃst rozÅ¡ÃÅ™enÃ© stavovÃ© informace ze souboru jmsou.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : PÅ™i startu stÃ¡hnout novÃ© seznamy balÃkÅ¯.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : PÅ™i startu spustit instalaci.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Tato aptitude nemÃ¡ schopnosti svatÃ© krÃ¡vy.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o vyÅ¾aduje argument ve tvaru klÃÄ=hodnota, zadÃ¡no %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "PODIVNÃ‰: obdrÅ¾en kÃ³d neznÃ¡mÃ© volby\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "MÅ¯Å¾ete zadat pouze jednu z voleb -u a -i\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "-u a -i nemohou bÃ½t pouÅ¾ity v Å™Ã¡dkovÃ©m mÃ³du (napÅ™. s 'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u a -i nemohou bÃ½t pouÅ¾ity spoleÄnÄ› s pÅ™Ãkazem"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "NeznÃ¡mÃ½ pÅ™Ãkaz \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2063,7 +2165,7 @@
 msgid "Lost"
 msgstr "ProhrÃ¡l"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "HledÃ¡nÃ min"
 
@@ -2239,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 "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:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "BalÃk"
 
@@ -3685,52 +3787,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Hmm, nenastaly Å¾Ã¡dnÃ© chyby; to by se nemÄ›lo stÃ¡vat.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Hledat:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "JiÅ¾ jste root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Podproces skonÄil chybou -- zadali jste sprÃ¡vnÃ© heslo?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "NahrÃ¡vÃ¡m cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Opravdu ukonÄit Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Opravdu zahodit osobnÃ nastavenÃ a naÄÃst standardnÃ hodnoty?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "BalÃky"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "ZobrazÃ dostupnÃ© balÃky a akce, kterÃ© s nimi mÅ¯Å¾ete provÃ¡dÄ›t"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3746,15 +3848,15 @@
 "NÃ¡povÄ›da, 'licence'. Toto je svobodnÃ½ software a budeme rÃ¡di, kdyÅ¾ jej\n"
 "budete dÃ¡le Å¡ÃÅ™it; podrobnosti viz 'licence'."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-cs.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README.cs"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3762,45 +3864,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "PokraÄovat"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "NÃ¡hled instalace balÃkÅ¯"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "ZobrazÃ a/nebo upravÃ akce, kterÃ© se majÃ vykonat"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^PÅ™edchozÃ"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "NÄ›kterÃ© balÃky byly poÅ¡kozenÃ©, ale podaÅ™ilo se je opravit"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3809,23 +3911,23 @@
 "Instalace/odebrÃ¡nÃ balÃkÅ¯ vyÅ¾aduje administrÃ¡torskÃ¡ prÃ¡va, kterÃ¡\n"
 "momentÃ¡lnÄ› nemÃ¡te. Chcete se pÅ™epnout na ÃºÄet root?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "StÃ¡t se rootem"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "NestÃ¡t se rootem"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3838,7 +3940,7 @@
 "aktualizovat.\n"
 "Aktualizaci mÅ¯Å¾ete pÅ™ipravit klÃ¡vesou \"U\"."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3847,99 +3949,112 @@
 "Aktualizace seznamu balÃkÅ¯ vyÅ¾aduje administrÃ¡torskÃ¡ prÃ¡va, kterÃ¡\n"
 "momentÃ¡lnÄ› nemÃ¡te. Chcete se pÅ™epnout na ÃºÄet root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "MaÅ¾u staÅ¾enÃ© soubory"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "StaÅ¾enÃ© balÃky byly smazÃ¡ny"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "StarÃ© staÅ¾enÃ© balÃky byly smazÃ¡ny"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "UkrÃ¡tit Äas hledÃ¡nÃm min."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Nemohu otevÅ™Ãt %s pro zÃ¡pis"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Instalovat/odstranit balÃky"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Provede vÅ¡echny nevyÅ™ÃzenÃ© instalace a odstraÅˆovÃ¡nÃ"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Aktualizovat seznam balÃkÅ¯"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "ZjistÃ, zda nejsou k dispozici novÄ›jÅ¡Ã verze balÃkÅ¯"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Zapomenout novÃ© balÃky"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Zapomene, kterÃ© balÃky jsou \"novÃ©\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "VyÄistit ^cache s balÃky"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "SmaÅ¾e staÅ¾enÃ© soubory (balÃky) z /var/cache/apt"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "VyÄistit starÃ© s^oubory"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "SmaÅ¾e soubory, kterÃ© se jiÅ¾ nedajÃ stÃ¡hnout"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "OznaÄit aktualizovatelnÃ©"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "ZahrÃ¡t si minovÃ© ^pole"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "StÃ¡t se rootem"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3948,69 +4063,69 @@
 "Pro pÅ™epnutÃ na uÅ¾ivatele root spusÅ¥te 'su'. TÃm se program restartuje,\n"
 "ale nastavenÃ budou zachovÃ¡na"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "Znovu naÄÃst cache"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Znovu naÄÃst obsah cache"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "Konec"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "UkonÄÃ program"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "ZpÄ›t"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Instalovat"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "OznaÄÃ aktuÃ¡lnÄ› vybranÃ½ balÃk pro instalaci nebo aktualizaci"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "Odst^ranit"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "OznaÄÃ aktuÃ¡lnÄ› vybranÃ½ balÃk pro odstranÄ›nÃ"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "VyÄistit"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "Ponechat"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Na vybranÃ©m balÃku zruÅ¡Ã veÅ¡kerÃ© akce"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "PÅ™idrÅ¾et"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4018,11 +4133,11 @@
 "Na vybranÃ©m balÃku zruÅ¡Ã veÅ¡kerÃ© akce a ochrÃ¡nÃ jej pÅ™ed budoucÃmi "
 "aktualizacemi."
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Spravovat ^automaticky"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4031,11 +4146,11 @@
 "OznaÄÃ vybranÃ½ balÃk, jako instalovanÃ½ automaticky;\n"
 "pokud na nÄ›m nebudou zÃ¡viset jinÃ© balÃky, bude automaticky odstranÄ›n."
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Spravovat ruÄnÄ›"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4044,11 +4159,11 @@
 "OznaÄÃ vybranÃ½ balÃk, jako by byl nainstalovÃ¡n ruÄnÄ›;\n"
 "takovÃ½ nebude odstranÄ›n, dokud jej neodstranÃte sami"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "ZakÃ¡zat ^verzi"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4057,215 +4172,215 @@
 "ZakÃ¡Å¾e, aby se nainstalovala kandidÃ¡tskÃ¡ verze balÃku;\n"
 "novÄ›jÅ¡Ã verze balÃku se budou instalovat jako obvykle"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformace"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Pro vybranÃ½ balÃk zobrazÃ dalÅ¡Ã informace"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 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:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "Hledat"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "HledÃ¡ balÃk"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Hledat znovu"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Zopakuje poslednÃ hledÃ¡nÃ"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "Omezit zobrazenÃ"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Na seznam balÃkÅ¯ aplikuje vÃ½bÄ›rovÃ½ filtr"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "ZruÅ¡it omezenÃ"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "OdstranÃ filtr aplikovanÃ½ na seznam balÃkÅ¯"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Hledat poruÅ¡enÃ©"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "HledÃ¡ dalÅ¡Ã balÃk s nesplnÄ›nÃ½mi zÃ¡vislostmi"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "NastavenÃ zobrazenÃ"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "ZmÄ›nÃ nastavenÃ, kterÃ¡ ovlivÅˆujÃ uÅ¾ivatelskÃ© rozhranÃ"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "SprÃ¡va zÃ¡vislostÃ"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "RÅ¯znÃ©"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "ZmÄ›nÃ ostatnÃ nastavenÃ programu"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "PÅ¯vodnÃ nastavenÃ"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "VrÃ¡tÃ vÅ¡echna nastavenÃ do pÅ¯vodnÃho stavu"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "DalÅ¡Ã"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "ZobrazÃ dalÅ¡Ã pohled"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^PÅ™edchozÃ"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "ZobrazÃ pÅ™edchozÃ pohled"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "ZavÅ™Ãt"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "ZavÅ™e tento pohled"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "No^vÃ½ pohled na balÃky"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "VytvoÅ™Ã novÃ½ standardnÃ pohled na balÃky"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "NovÃ½ prohlÃÅ¾eÄ kategoriÃ"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "ProhlÃÅ¾Ã balÃky podle kategoriÃ"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "O progr^amu"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "ZobrazÃ informace o programu"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "NÃ¡povÄ›da"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "ZobrazÃ on-line nÃ¡povÄ›du"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "UÅ¾ivatelskÃ½ ^manuÃ¡l"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "ZobrazÃ podrobnÃ½ manuÃ¡l tohoto programu"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "ZobrazÃ seznam Äasto kladenÃ½ch otÃ¡zek"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "ZobrazÃ dÅ¯leÅ¾itÃ© zmÄ›ny mezi jednotlivÃ½mi verzemi programu"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Akce"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Hledat"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Volby"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Pohledy"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "NÃ¡povÄ›da"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Menu  %s: NÃ¡povÄ›da  %s: Konec  %s Aktualizace  %s StaÅ¾enÃ/Instalace"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ano_key"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ne_key"
 
@@ -4307,13 +4422,55 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au! Dostal mÄ› SIGQUIT, umÃrÃ¡m..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ano"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Ne"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "PÅ™Ãkazy:\n"
+#~ "  y: pokraÄovat v instalaci\n"
+#~ "  n: pÅ™eruÅ¡it a skonÄit\n"
+#~ "  i: zobrazÃ informace o balÃcÃch, jejichÅ¾ nÃ¡zvy\n"
+#~ "     nÃ¡sledujÃ za 'i'.\n"
+#~ "  c: zobrazÃ seznamy zmÄ›n, kterÃ© provedli sprÃ¡vci balÃkÅ¯;\n"
+#~ "     nÃ¡zvy balÃkÅ¯ uveÄte za 'c'\n"
+#~ "  d: zapne/vypne zobrazenÃ informacÃ o zÃ¡vislostech\n"
+#~ "  s: zapne/vypne zobrazenÃ zmÄ›n ve velikostech balÃkÅ¯\n"
+#~ "  v: zapne/vypne zobrazenÃ verzÃ\n"
+#~ "  e: vstoupit do plnÄ› vizuÃ¡lnÃho rozhranÃ\n"
+#~ "\n"
+#~ "  TakÃ© mÅ¯Å¾ete zadat dodateÄnÃ© akce nad balÃky:\n"
+#~ "  NapiÅ¡te znak akce nÃ¡sledovanÃ½ jednÃm nebo vÃce nÃ¡zvy balÃkÅ¯ nebo "
+#~ "vzorÅ¯.\n"
+#~ "Akce se provede na vÅ¡ech zadanÃ½ch balÃcÃch. (MÅ¯Å¾ete zadat i vÃce akcÃ,\n"
+#~ "kaÅ¾dÃ¡ se vztahuje na balÃky, kterÃ© ji nÃ¡sledujÃ.)\n"
+#~ "\n"
+#~ "Akce:\n"
+#~ "  + : Instalace\n"
+#~ "  - : OdstranÄ›nÃ\n"
+#~ "  _ : OdstranÄ›nÃ i s konfiguracÃ\n"
+#~ "  = : PodrÅ¾enÃ v aktuÃ¡lnÃm stavu\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-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"
@@ -156,7 +156,7 @@
 msgstr "Afinstallér ubrugte pakker automatisk som matcher dette filter"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "O.k."
@@ -299,48 +299,48 @@
 "Bemærk: vælger \"%s\" i stedet for\n"
 "        den virtuelle pakke \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s er allerede installeret i den ønskede version (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s er aktuelt ikke installeret, så den vil ikke blive geninstalleret.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Pakke %s er ikke installeret, så den vil ikke blive afinstalleret\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakke %s er ikke installeret, kan ikke forbyde en opgradering\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pakke %s er ikke opgraderbar, kan ikke forbyde en opgradering\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Bemærk: vælger opgavepakken \"%s: %s\" til installering\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Man kan kun angive en pakkeversion med kommandoen \"install\".\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Man kan kun angive et pakkearkiv med kommandoen \"install\".\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -349,7 +349,7 @@
 "Kunne ikke finde pakke \"%s\" og mere end 40\n"
 "pakker som har \"%s\" i deres navn.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -358,13 +358,13 @@
 "Kunne ikke finde pakken \"%s\". Men følgende\n"
 "pakker har \"%s\" i deres navn:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Kunne ikke finde nogen pakke, hvis navn eller beskrivelse passer på \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -373,7 +373,7 @@
 "Kunne ikke finde nogen pakke som passer på \"%s\" og mere end 40\n"
 "pakker som har \"%s\" i deres navn.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -382,6 +382,11 @@
 "Kunne ikke finde nogen pakke som passer på \"%s\", men følgende\n"
 "pakker har \"%s\" i deres beskrivelse:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Forkert tegn \"%c\" til handling\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Kan ikke starte et skærmvisningsprogram, virker dette Debian-system?"
@@ -422,7 +427,7 @@
 msgid "Invalid operation %s"
 msgstr "Ugyldig operation %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -433,16 +438,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "download: du skal angive mindst én pakke til download\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Kunne ikke læse liste over pakkekilder"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Kan ikke finde nogen pakke ved navn \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -499,97 +504,97 @@
 msgstr ""
 "Hvad det er? Det er en elefant der bliver ædt af en slange, selvfølgelig.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Kunne ikke læse liste over pakkekilder"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "men %s vil blive installeret."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "men %s er installeret, og den er tilbageholdt."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "men %s er installeret."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "men den kan ikke installeres"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " som er en virtuel pakker"
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " eller"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Følgende pakker er BRUDTE:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Følgende pakker er ikke i brug og vil blive AFINSTALLERET:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Følgende pakker er automatisk blevet tilbageholdt:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Følgende NYE pakker vil automatisk blive installeret:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Følgende pakker vil automatisk blive AFINSTALLERET:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil blive NEDGRADERET:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er blevet tilbageholdt:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Følgende pakker vil blive GENINSTALLERET:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil blive installeret:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil blive AFINSTALLERET:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil blive opgraderet:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Følgende ESSENTIELLE pakker vil blive AFINSTALLERET!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Følgende ESSENTIELLE pakkers afhængigheder vil blive BRUDT af denne "
 "handling:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -598,99 +603,226 @@
 "ADVARSEL: Udførelsen af denne handling vil nok ødelægge dit system!\n"
 "          Fortsæt IKKE, medmindre du ved PRÆCIS hvad det er du gør!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "jeg er klar over at dette er en meget dårlig idé"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "For at fortsætte, indtast sætningen \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Nej"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "For at fortsætte, indtast sætningen \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Følgende pakker ANBEFALES installeret, men vil IKKE blive det:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Følgende pakker FORESLÅS installeret, men vil IKKE blive det:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakker opgraderet, %lu nyinstalleret,  "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geninstalleret, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderet, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu til afinstallering og %lu ikke opgraderet.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Skal hente %sB/%sB arkiver. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Skal hente %sB arkiver. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Efter udpakning vil %sB blive brugt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Efter udpakning vil %sB blive frigjort.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Forkert tegn \"%c\" til handling\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ingen pakker at vise - angiv pakkenavne på linjen efter \"i\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Tryk retur for at fortsætte."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Ingen pakker fundet - angiv pakkenavne på linjen efter \"c\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Tryk retur for at fortsætte."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Formatet for pakkeoversigter"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Installér/afinstallér pakker"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Følgende NYE pakker vil automatisk blive installeret:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Installér/afinstallér pakker"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Glem nye pakker"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold        - Tilbagehold en pakke\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - Marker pakker som værende automatisk installeret\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - Marker pakker som værende manuelt installeret\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "anbefaler"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vil du fortsætte) [Y/n?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -701,7 +833,7 @@
 "Oplysning om afhængigheder vil blive vist\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -712,7 +844,7 @@
 "Oplysning om afhængigheder vil ikke blive vist\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -723,7 +855,7 @@
 "Versioner vil blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -734,7 +866,7 @@
 "Versioner vil ikke blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -745,7 +877,7 @@
 "Størrelsesændringer vil blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -756,127 +888,102 @@
 "Størrelsesændringer vil ikke blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Kommandoer:\n"
-"  y: fortsæt med installeringen\n"
-"  n: afbryd og afslut\n"
-"  i: vis information om en eller flere pakker\n"
-"     pakkenavne skal angives efter \"i\".\n"
-"  c: vis Debians logfil over programændringer for en eller flere pakker;\n"
-"\"  d: vis/skjul information om afhængigheder\n"
-"  s: vis/skjul ændringer i pakkestørrelser\n"
-"  v: vis/skjul versioner\n"
-"  e: gå til den fulde visuelle brugerflade\n"
-"\n"
-"  Man kan også lave ændringer i flere pakkehandlinger på en gang.\n"
-"  For at gøre dette, indtast et bogstav der angiver en handling, efterfulgt\n"
-"af et eller flere pakkenavne eller -mønstre. Handlingen vil da blive\n"
-"udført på alle pakkerne (man kan tilføje flere handlinger som hver især\n"
-"vil blive anvendt på alle efterfølgende pakker)\n"
-"\n"
-"Handlinger:\n"
-"  + : Installér\n"
-"  - : Afinstallér\n"
-"  _ : Udrens\n"
-"  = : Tilbagehold\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ugyldigt svar. Anfør en gyldig kommando eller \"?\" for hjælp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Afslut programmet"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Følgende pakker har uopfyldte afhængigheder:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Følgende pakker er BRUDTE:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Fejl ved skrivning til tilstandsfil"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, 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:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, 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:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "søg: du skal indtaste mindst én søgeterm\n"
@@ -1171,7 +1278,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter hentede filer som er forældede"
 
@@ -1455,23 +1562,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Kunne ikke reparere afhængigheder, visse pakker kan ikke installeres"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Kildelisten til pakker kunne ikke læses"
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakkelisterne eller statusfilen kunne hverken fortolkes eller åbnes"
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "En opdatering af pakkelisterne vil måske korrigere for manglende filer"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Kunne ikke åbne %s til skrivning"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1738,17 +1840,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ugyldig type '%s' på sorteringsmetode"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s oversat på %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Oversætter: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1757,7 +1859,7 @@
 "\n"
 "NCurses, version: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1766,22 +1868,22 @@
 "\n"
 "Curses, version: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ version: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Brug: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [tilvalg] <handling> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1790,42 +1892,42 @@
 "  Handlinger (er ingen angivet, vil aptitude gå i interaktiv tilstand):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Installér/opgradér pakker\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Afinstallér pakker\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Afinstallér pakker og deres opsætningsfiler\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold        - Tilbagehold en pakke\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Fortryd tilbageholdelse af en pakke\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - Marker pakker som værende automatisk installeret\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Marker pakker som værende manuelt installeret\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1834,17 +1936,17 @@
 " forbid-version - Forbyd aptitude at opgradere til en specifik "
 "pakkeversion.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Hent lister over nye/opgradérbare pakker\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Udfør en sikker opgradering\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1853,75 +1955,75 @@
 " dist-upgrade - Udfør en opgradering, pakker vil muligvis blive installeret "
 "og afinstalleret\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Glem hvilke pakker der er \"nye\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Søg efter en pakke efter navn og/eller udtryk\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Vis detaljerede oplysninger om en pakke\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Slet hentede pakkefiler\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Slet gamle, hentede pakkefiler\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Vis en pakkes ændringslog\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Hent en pakkes .deb-fil\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Tilvalg:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Denne hjælpetekst\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simulér handlinger uden faktisk at udføre dem.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Hent kun pakker, installér eller afinstallér ikke noget.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Spørg altid om bekræftelse eller handlinger\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             Antag at svaret til simple ja/nej-spørgsmål er 'ja'\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1929,63 +2031,63 @@
 msgstr ""
 " -F format      Anfør et format til visning af søgeresultater; se manualen\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 " -O order       Anfør sorteringsorden for søgeresultater; se manualen\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 " -w width       Angiv en skærmbredde til formatering af søgeresultater\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Prøv aggressivt at reparere brudte pakkeafhængigheder.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Vis hvilke versioner af pakker der skal installeres.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Vis afhængigheder for pakker der er ændret automatisk.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 " -Z\t\t    Vis ændring i hver pakkes pladsforbrug efter installering.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v             Vis ekstra information (kan anføres flere gange).\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [udgave]   Angiv hvilken udgave pakker skal installeres fra\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o nøgle=værdi     Tildel værdi direkte til opsætningstilvalget \"nøgle\"\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1994,63 +2096,63 @@
 " --with(out)-recommends\tAngiv om anbefalede pakker skal behandles som\n"
 "                stærke afhængigheder\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fname: læs aptitudes udvidede statusinfo fra fnavn.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u     : Hent nye pakkelister under start\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i     : Udfør en installeringskørsel ved opstart\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptitude har ikke \"Super Cow Powers\".\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o kræver et argument på formen taste=værdi, modtog %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MYSTISK: modtog en ukendt kode for tilvalg\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Kun -u eller -i må angives\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u og -i må ikke angives i kommandolinjetilstand (f.eks. med 'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u og -i må ikke angives i en kommando"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ukendt kommando \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2081,7 +2183,7 @@
 msgid "Lost"
 msgstr "Tabte"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Minestryger"
 
@@ -2258,7 +2360,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pakke"
 
@@ -3730,53 +3832,53 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Hov, der er ingen fejl, dette burde ikke være sket ..."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Søg efter:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Du er allerede root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Underprocessen afsluttedes med en fejl - skrev du dit password rigtigt?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Indlæser cache ..."
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Afslut Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Vil du forkaste dine egne indstillinger og genindlæse de forvalgte?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pakker"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Se tilgængelige pakker og vælg hvilke handlinger der skal udføres"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3792,15 +3894,15 @@
 "Hjælpemenuen. Dette er fri software, og du er velkommen til at\n"
 "gendistribuere det under visse betingelser; se 'Licens' for detaljer."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3808,45 +3910,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Fortsæt"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Forhåndsvisning af pakkeinstallering"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Forrige"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Visse pakkeafhængigheder var brudte og er blevet repareret"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3855,23 +3957,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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Bliv root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Bliv ikke root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3883,7 +3985,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:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3892,99 +3994,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:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Sletter hentede filer"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Hentede pakkefiler er blevet slettet"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, 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:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, 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:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Kunne ikke åbne %s til skrivning"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Installér/afinstallér pakker"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Udfør alle afventende installeringer og afinstalleringer"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Opdatér pakkeliste"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Check efter nye versioner af pakker"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Glem nye pakker"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker der er \"nye\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^Tøm pakkecache"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Slet tidligere hentede pakkefiler"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Slet ^forældede filer"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slet pakkefiler som ikke længere kan hentes"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "^Marker opgradérbare"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle ikke-tilbageholdte pakker til opgradering"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Spil minestryger"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Bliv ^root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3993,69 +4108,69 @@
 "Kør \"su\" for at blive root. Dette vil genstarte programmet, men dine\n"
 "indstillinger vil blive bevaret"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Genindlæs pakkecache"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Genindlæs pakkecachen"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Afslut"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Afslut programmet"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Fortryd den sidste pakkehandling eller gruppe af handlinger"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Installér"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Markér den aktuelt valgte pakke til installering eller opgradering"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Afinstallér"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Markér den aktuelt valgte pakke til afinstallering"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Udrens"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Fortryd alle handlinger på den valgte pakke"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Tilbagehold"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4063,11 +4178,11 @@
 "Fortryd alle handlinger på den valgte pakke og beskyt den mod\n"
 "fremtidige opgraderinger"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Markér a^uto"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4077,11 +4192,11 @@
 "den vil blive afinstalleret automatisk hvis ingen andre pakker\n"
 "afhænger af den"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Markér ^manuel"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4090,11 +4205,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:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Forbyd version"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4103,215 +4218,215 @@
 "Forbyd at kandidat-versionen af den valgte pakke bliver installeret;\n"
 "nyere versioner af pakken vil blive installeret som sædvanlig"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "^Oplysning"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Vis flere oplysninger om den valgte pakke"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Programændringer"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians logfil over programændringer for den valgte pakke"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Find"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Søg efter en pakke"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Find ^igen"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Gentag sidste søgning"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Afgræns visning"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Anvend et filter på pakkelisten"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Uafgrænset visning"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Fjern filteret fra pakkelisten"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Find ^brudte"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Find næste pakke med uopfyldte afhængigheder"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^Brugergrænseflade"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Ændr indstillinger som påvirker brugergrænsefladen"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Afhængigheder"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Diverse"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Ændr diverse programindstillinger"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Nulstil indstillinger"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Nulstil alle indstillinger til systemets forvalgte"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Næste"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Vis næste skærmbillede"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Forrige"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Vis forrige skærmbillede"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Luk"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Luk dette skærmbillede"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Ny pakke^oversigt"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Lav en ny standard for pakkeoversigt"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Ny ^kategorivisning"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Vis pakker efter kategori"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Vis information om dette program"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Hjælp"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Læs online-hjælpen"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Brugervejledning"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Vis den detaljerede program-manual"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over ofte stillede spørgsmål"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Vis vigtige ændringer lavet i hver version af programmet"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licens"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Læs betingelserne for kopiering af dette program"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Søg"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Indstillinger"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Skærmbilleder"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Menu  %s: Hjælp  %s: Afslut  %s: Opdatér  %s: Hent/Installér/Afinstallér"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ja_taste"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "nej_taste"
 
@@ -4354,13 +4469,55 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Av! Modtog SIGQUIT, dør ..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ja"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Nej"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Kommandoer:\n"
+#~ "  y: fortsæt med installeringen\n"
+#~ "  n: afbryd og afslut\n"
+#~ "  i: vis information om en eller flere pakker\n"
+#~ "     pakkenavne skal angives efter \"i\".\n"
+#~ "  c: vis Debians logfil over programændringer for en eller flere pakker;\n"
+#~ "\"  d: vis/skjul information om afhængigheder\n"
+#~ "  s: vis/skjul ændringer i pakkestørrelser\n"
+#~ "  v: vis/skjul versioner\n"
+#~ "  e: gå til den fulde visuelle brugerflade\n"
+#~ "\n"
+#~ "  Man kan også lave ændringer i flere pakkehandlinger på en gang.\n"
+#~ "  For at gøre dette, indtast et bogstav der angiver en handling, "
+#~ "efterfulgt\n"
+#~ "af et eller flere pakkenavne eller -mønstre. Handlingen vil da blive\n"
+#~ "udført på alle pakkerne (man kan tilføje flere handlinger som hver især\n"
+#~ "vil blive anvendt på alle efterfølgende pakker)\n"
+#~ "\n"
+#~ "Handlinger:\n"
+#~ "  + : Installér\n"
+#~ "  - : Afinstallér\n"
+#~ "  _ : Udrens\n"
+#~ "  = : Tilbagehold\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-12-01 18:09GMT\n"
 "Last-Translator: Dennis Stampfer <seppy at debian.org>\n"
 "Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
@@ -152,7 +152,7 @@
 "Nicht verwendete Pakete autom. entfernen, die auf dieses Muster passen:"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "OK"
@@ -295,52 +295,52 @@
 "Hinweis: WÃ¤hle Â»%sÂ« anstelle des\n"
 "      virtuellen Pakets Â»%sÂ«.\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "Â»%sÂ« ist bereits in der angeforderten Version (%s) installiert.\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s ist momentan nicht installiert und wird folglich nicht erneut "
 "installiert.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Paket %s ist nicht installiert, wird nicht entfernt\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Paket %s ist nicht installiert, kann kein Upgrade verbieten\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Paket %s kann nicht aktualisiert werden, kann also kein Upgrade verbieten\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Hinweis: WÃ¤hle den Task Â»%s: %sÂ« zur Installation aus.\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 "Sie kÃ¶nnen die Version eines Pakets nur bei einem Â»installÂ«-Befehl angeben.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "Sie kÃ¶nnen das Archiv eines Pakets nur bei einem Â»installÂ«-Befehl angeben.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -349,7 +349,7 @@
 "Konnte Paket Â»%sÂ« nicht finden, und mehr als 40 Pakete\n"
 "enthalten Â»%sÂ« in ihrem Namen:\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -358,13 +358,13 @@
 "Konnte Paket Â»%sÂ« nicht finden, aber die folgenden Pakete\n"
 "enthalten Â»%sÂ« in ihrem Namen:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Konnte kein Paket finden, dessen Name oder Beschreibung auf Â»%sÂ« passt.\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -373,7 +373,7 @@
 "Konnte kein Paket finden, das auf Â»%sÂ« passt, und mehr als 40\n"
 "Pakete enthalten Â»%sÂ« in ihrer Beschreibung.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -382,6 +382,11 @@
 "Konnte kein Paket finden, das auf Â»%sÂ« passt, allerdings enthalten\n"
 "die folgenden Pakete Â»%sÂ« in ihrer Beschreibung:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "UngÃ¼ltiger Befehlsbuchstabe '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -426,7 +431,7 @@
 msgid "Invalid operation %s"
 msgstr "UngÃ¼ltige Operation: %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -437,16 +442,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "download: Sie sollten ein Paket zum Herunterladen angeben.\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Konnte Liste der Quellen nicht lesen"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Konnte kein Paket namens Â»%sÂ« finden"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -505,99 +510,99 @@
 "Was das ist? NatÃ¼rlich ein Elefant, der von einer Schlange gefressen wurde.\n"
 "Hier ist Dein Schild.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Konnte Liste der Paketquellen nicht lesen"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "aber %s soll installiert werden."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "aber %s ist installiert und wird zurÃ¼ckgehalten."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "aber %s ist installiert."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "ist aber nicht installationsfÃ¤hig"
 
 #  FIXME: do something sensible here!
 #  FIXME: do something sensible here!
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr ", welches ein virtuelles Paket ist."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " oder"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Die folgenden Pakete sind KAPUTT:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Die folgenden Pakete sind nicht verwendet und werden ENTFERNT:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Die folgenden Pakete werden automatisch zurÃ¼ckgehalten:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Die folgenden Pakete werden zusÃ¤tzlich automatisch installiert:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Die folgenden Pakete werden automatisch ENTFERNT:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 "Die folgenden Pakete werden durch eine Ã„LTERE VERSION ERSETZT (Downgrade):"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Die folgenden Pakete werden zurÃ¼ckgehalten:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Die folgenden Pakete werden ERNEUT INSTALLIERT:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Die folgenden Pakete werden zusÃ¤tzlich installiert:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Die folgenden Pakete werden ENTFERNT:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Die folgenden Pakete werden aktualisiert:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Die folgenden ESSENTIELLEN Pakete werden ENTFERNT!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Die folgenden ESSENTIELLEN Pakete werden nach dieser Ã„nderung KAPUTT sein:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -607,100 +612,228 @@
 "beschÃ¤digen!\n"
 "         BRECHEN SIE AB, wenn Sie nicht GENAU wissen, was Sie tun!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Mir ist klar, dass das eine sehr schlechte Idee ist."
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Geben Sie zum BestÃ¤tigen den Satz Â»%sÂ« ein:\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Nein"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Geben Sie zum BestÃ¤tigen den Satz Â»%sÂ« ein:\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Die folgenden Pakete werden EMPFOHLEN, aber NICHT installiert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 "Die folgenden Pakete wurden VORGESCHLAGEN, werden aber NICHT installiert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Es werden keine Pakete installiert, aktualisiert oder entfernt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu Pakete aktualisiert, %lu zusÃ¤tzlich installiert, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu erneut installiert, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu deaktualisiert, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu werden entfernt und %lu nicht aktualisiert.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Muss %sB/%sB an Archiven herunterladen."
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Muss %sB an Archiven herunterladen."
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Nach dem Entpacken werden %sB zusÃ¤tzlich belegt sein.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Nach dem Entpacken werden %sB frei werden.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "UngÃ¼ltiger Befehlsbuchstabe '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Keine Pakete zum Anzeigen -- geben Sie Paketnamen nach dem 'i' an.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "DrÃ¼cken Sie zum Fortsetzen die Eingabetaste."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Keine Pakete zum Anzeigen -- geben Sie Paketnamen nach dem 'c' an.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "DrÃ¼cken Sie zum Fortsetzen die Eingabetaste."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Anzeigeformat fÃ¼r Paketansichten"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Installieren/Entfernen von Paketen"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Die folgenden Pakete werden zusÃ¤tzlich automatisch installiert:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Installieren/Entfernen von Paketen"
+
+#  FIXME: this is a bad name for the menu item.
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "Neue Pakete ^vergessen"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold           Pakete auf Â»zurÃ¼ckhaltenÂ« setzen\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto       Pakete als automatisch installiert markieren\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto     Pakete als manuell installiert markieren\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "empfiehlt"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Wollen Sie fortsetzen? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -711,7 +844,7 @@
 "AbhÃ¤ngigkeiten werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -722,7 +855,7 @@
 "AbhÃ¤ngigkeiten werden nicht angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -733,7 +866,7 @@
 "Versionen werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -744,7 +877,7 @@
 "Versionen werden nicht angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -755,7 +888,7 @@
 "GrÃ¶ÃŸenverÃ¤nderungen werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -766,135 +899,108 @@
 "GrÃ¶ÃŸenverÃ¤nderungen werden nicht angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Befehle:\n"
-"  y: weiter mit der Installation\n"
-"  n: abbrechen und beenden\n"
-"  i: Informationen Ã¼ber ein oder mehrere Pakete anzeigen\n"
-"     die Paketnamen sollten nach dem Â»iÂ« folgen\n"
-"  c: das Debian-Ã„nderungsprotokoll eines Pakets anzeigen\n"
-"     der/die Paketnamen sollten nach dem Â»cÂ« folgen\n"
-"  d: Anzeige von AbhÃ¤ngigkeitsinfos ein/aus\n"
-"  s: Anzeige der GrÃ¶ÃŸenverÃ¤nderungen ein/aus\n"
-"  v: Anzeige der Versionen ein/aus\n"
-"  e: die visuelle OberflÃ¤che starten\n"
-"\n"
-"  Sie kÃ¶nnen auch Ã„nderungen an den geplanten Aktionen vornehmen.\n"
-"  Dazu geben Sie einen Befehlsbuchstaben gefolgt von einem oder mehreren\n"
-"  Paketnamen oder -mustern ein.  Der Befehl wird auf alle Pakete angewandt.\n"
-"  (Sie kÃ¶nnen auch zusÃ¤tzliche Befehle angeben;  jeder wird auf alle "
-"folgenden\n"
-"  Pakete angewandt.)\n"
-"\n"
-"Befehle:\n"
-"  + : Installieren\n"
-"  - : Entfernen\n"
-"  _ : VollstÃ¤ndig entfernen (Â»purgeÂ«, auch Konfigurationsdateien lÃ¶schen)\n"
-"  = : ZurÃ¼ckhalten\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "UngÃ¼ltige Antwort.  Bitte geben Sie einen gÃ¼ltigen Befehl oder Â»?Â« fÃ¼r Hilfe "
 "ein.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Aptitude verlassen"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Die folgenden Pakete haben verletzte AbhÃ¤ngigkeiten:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Die folgenden Pakete sind KAPUTT:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Fehler beim Schreiben der Statusdatei"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, 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:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, 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:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: Sie mÃ¼ssen einen Suchbegriff angeben\n"
@@ -1196,7 +1302,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "LÃ¶sche veraltete heruntergeladene Dateien"
 
@@ -1488,26 +1594,21 @@
 "Konnte AbhÃ¤ngigkeiten nicht korrigieren, manche Pakete kÃ¶nnen nicht "
 "installiert werden"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Die Paketliste oder Statusdatei konnte nicht gelesen oder geÃ¶ffnet werden."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Sie wollen vielleicht die Paketlisten aktualisieren um die fehlenden Dateien "
 "zu ergÃ¤nzen"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "%s konnte nicht zum schreiben geÃ¶ffnet werden"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1780,17 +1881,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "UngÃ¼ltiger Sortierregel-Typ '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompiliert am %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compiler: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1799,7 +1900,7 @@
 "\n"
 "NCurses-Version: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1808,81 +1909,81 @@
 "\n"
 "Curses-Version: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++-Version: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Verwendung: aptitude [-S dname] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "            aptitude [Optionen] <Aktion> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr "Aktionen (wenn keine angegeben wird, startet Aptitude interaktiv):\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install        Installiere/Aktualisiere Pakete\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove         Entferne Pakete\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge          Entferne Pakete und ihre Konfigurationsdateien\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold           Pakete auf Â»zurÃ¼ckhaltenÂ« setzen\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold         Einen Â»holdÂ«-Befehl zurÃ¼cknehmen\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto       Pakete als automatisch installiert markieren\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto     Pakete als manuell installiert markieren\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version Upgrade auf eine bestimmte Paketversion verbieten\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update         Neue Listen neuer/aktualisierbarer Paketen laden\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade        Sicheres Upgrade durchfÃ¼hren\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1891,58 +1992,58 @@
 " dist-upgrade   Upgrade durchfÃ¼hren, dabei ggf. Pakete installieren/"
 "entfernen\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new     Vergessen welche Pakete Â»neuÂ« sind\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search         Pakete nach Namen oder Ausdruck suchen\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show           Details Ã¼ber ein Paket anzeigen\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean          Heruntergeladene Pakete lÃ¶schen\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean      Alte heruntergeladene Pakete lÃ¶schen\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog      Ã„nderungsprotokoll eines Pakets\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download       Die .deb-Datei eines Pakets herunterladen\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "Optionen:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Dieser Hilfetext\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Aktionen simulieren, aber nicht wirklich durchfÃ¼hren.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1950,12 +2051,12 @@
 " -d             Pakete nur herunterladen, nichts installieren oder "
 "entfernen.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Immer zur BestÃ¤tigung nachfragen\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1963,7 +2064,7 @@
 " -y             Annehmen, dass die Antwort auf einfache ja/nein-Fragen \"ja"
 "\" ist\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1971,7 +2072,7 @@
 msgstr ""
 " -F format      Format fÃ¼r die Suchergebnisse angeben;  vgl. Anleitung\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1979,37 +2080,37 @@
 " -O order       Wie die Suchergebnisse sortiert werden sollen;  vgl. "
 "Anleitung\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 " -w breite      Die Breite fÃ¼r die Formatierung der Suchergebnisse angeben\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Aggressiv versuchen kaputte Pakete zu reparieren.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Anzeigen, welche Version eines Pakets installiert wird\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             AbhÃ¤ngigkeiten automatisch verÃ¤nderter Pakete anzeigen\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z             GrÃ¶ÃŸenverÃ¤nderung der einzelnen Pakete anzeigen\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -2017,7 +2118,7 @@
 " -v             Mehr Informationen ausgeben (kann mehrfach verwendet "
 "werden)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -2025,12 +2126,12 @@
 " -t [release]   Das Â»ReleaseÂ«, aus dem Pakete installiert werden sollen\n"
 "                (z.B. stable, unstable, sarge, ...)\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o schl=wert   Die Einstellung 'schl' direkt setzen\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2040,66 +2141,66 @@
 "                Angeben, ob Â»EmpfehlungenÂ« wie starke\n"
 "                AbhÃ¤ngigkeiten gehandhabt werden sollen\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Die erweiterten Aptitude-Statusinformationen aus Â»fnameÂ« "
 "laden\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u             Neue Paketlisten beim Start laden.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i             Installationslauf am Anfang durchfÃ¼hren.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Dieses Aptitude hat keine Super-Kuh-KrÃ¤fte.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o erfordert ein Argument der Form schlÃ¼ssel=wert, erhielt Â»%sÂ«"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MERKWÃœRDIG: unbekannten Optionscode erhalten\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Es dÃ¼rfen nur entweder -u oder -i angegeben werden\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u und -i dÃ¼rfen nicht im Kommandozeilenmodus verwendet werden (z.B. mit "
 "'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u und -i dÃ¼rfen nicht mit einem Kommando verwendet werden"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Unbekanntes Kommando Â»%sÂ«\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2130,7 +2231,7 @@
 msgid "Lost"
 msgstr "Verloren"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Minesweeper"
 
@@ -2342,7 +2443,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paket"
 
@@ -3828,53 +3929,53 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Er, es gab keine Fehler, das sollte nicht passieren.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Suchen nach:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Sie sind bereits root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Unterprozess mit Fehler beendet -- richtiges Passwort?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Lade Cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Aptitude wirklich beenden?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Wirklich ihre persÃ¶nlichen Einstellungen verwerfen und Standardwerte laden?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pakete"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "VerfÃ¼gbare Pakete anzeigen und Ã„nderungen vornehmen"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3893,15 +3994,15 @@
 "unter bestimmten Bedingungen weiterzuvertreiben;  Details dazu finden Sie\n"
 "ebenfalls unter Â»LizenzÂ«."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-de.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3909,45 +4010,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Weiter"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Vorschau der Paketinstallation"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Anzeigen und anpassen der geplanten Aktionen"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Vorherige"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Manche Pakete waren kaputt und wurden repariert"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3956,25 +4057,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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Â»rootÂ« werden"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Nicht Â»rootÂ« werden"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "Ein Aktualisierungs oder Installationsvorgang findet gerade statt."
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3987,7 +4088,7 @@
 "ausgewÃ¤hlt.\n"
 "Geben Sie Â»Umschalt+UÂ« ein, um diese Pakete zu aktualisieren."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3996,105 +4097,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:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "LÃ¶sche heruntergeladene Dateien"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Heruntergeladene Dateien wurden gelÃ¶scht"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, 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:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Zeit verschwenden (Minensuchspiel)"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "%s konnte nicht zum schreiben geÃ¶ffnet werden"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Installieren/Entfernen von Paketen"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "DurchfÃ¼hren geplanter Installations- und LÃ¶schvorgÃ¤nge"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "Paketliste ^aktualisieren"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 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:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "Neue Pakete ^vergessen"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Vergessen, welche Pakete Â»neuÂ« sind"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "Paketcache komplett leeren"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Alle Paketdateien aus dem Paketcache lÃ¶schen"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Nur ^veraltete Paketdateien lÃ¶schen"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Aktualisierbare ^markieren"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Minesweeper spielen"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Root werden"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4103,69 +4217,69 @@
 "'su' ausfÃ¼hren um root zu werden.  Dies wird das Programm neu starten, aber\n"
 "Ihre Einstellungen werden erhalten bleiben."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "Paketcache ^neu laden"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Paketcache neu laden"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Beenden"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Aptitude verlassen"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "RÃ¼ckgÃ¤ngig"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Installieren"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 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:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Entfernen"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Das ausgewÃ¤hlte Paket zum Entfernen auswÃ¤hlen"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^VollstÃ¤ndig entfernen"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Beibehalten"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Alle Aktionen mit dem gewÃ¤hlten Paket zurÃ¼cknehmen"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^ZurÃ¼ckhalten"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4173,11 +4287,11 @@
 "Geplante VorgÃ¤nge mit dem gewÃ¤hlten Paket zurÃ¼cknehmen und\n"
 "es vor zukÃ¼nftigen Upgrades schÃ¼tzen"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Als ^automatisch markieren"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4187,11 +4301,11 @@
 "es wird dann automatisch gelÃ¶scht, wenn keine anderen Pakete mehr davon "
 "abhÃ¤ngen"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Als ^manuell markieren"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4200,11 +4314,11 @@
 "Dieses Paket als manuell installiert markieren;\n"
 "es wird dann nur noch auf Ihren Wunsch hin gelÃ¶scht."
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "Version verbieten"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4214,206 +4328,206 @@
 "noch neuere Versionen werden wie Ã¼blich installiert werden"
 
 # ummmm...
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "Informationen"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Mehr Informationen zum gewÃ¤hlten Paket"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Das Debian-Ã„nderungsprotokoll fÃ¼r das gewÃ¤hlte Paket anzeigen"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Suchen"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Nach einem Paket suchen"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "^Weitersuchen"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Die letzte Suche wiederholen"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Filtern des Paketbaums"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Einen Filter auf die Paketliste anwenden"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^LÃ¶schen des Filters"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Die Paketliste nicht mehr filtern"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Kaputtes Paket suchen"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Das nÃ¤chste Paket mit verletzten AbhÃ¤ngigkeiten finden"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^OberflÃ¤che"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Einstellungen verÃ¤ndern, die die BenutzeroberflÃ¤che betreffen"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^AbhÃ¤ngigkeisbehandlung"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Verschiedenes"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Sonstige Programmeinstellungen Ã¤ndern"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Optionen zurÃ¼cksetzen"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Alle Einstellungen auf die Vorgabewerte zurÃ¼cksetzen"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^NÃ¤chste"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "NÃ¤chste Ansicht zeigen"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Vorherige"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Vorherige Ansicht zeigen"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^SchlieÃŸen"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Ansicht schlieÃŸen"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Neue Paket^ansicht"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Eine neue Paketansicht erzeugen"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Neuen Kategorie-^Browser"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Pakete nach Kategorie durchsuchen"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "Ãœ^ber"
 
 # ummmm...
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Information Ã¼ber Aptitude"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "K^urzhilfe"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Kurzhilfe zu Aptitude"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Anleitung"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Die detaillierte Anleitung (README, derzeit nur englisch)"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Die Liste hÃ¤ufig gestellter Fragen (Frequently Asked Questions, FAQ)"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Protokoll der Ã„nderungen, die an Aptitude vorgenommen wurden"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "Lizen^z"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Die Bedingungen, unter denen Sie Aptitude kopieren dÃ¼rfen"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Suchen"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Optionen"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Ansichten"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4421,11 +4535,11 @@
 "%s: MenÃ¼  %s: Hilfe  %s: Beenden  %s: Update  %s: Download/Installieren/"
 "Entf. von Paketen"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
@@ -4469,13 +4583,58 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Aua!  SIGQUIT erhalten, sterbe...\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ja"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Nein"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Befehle:\n"
+#~ "  y: weiter mit der Installation\n"
+#~ "  n: abbrechen und beenden\n"
+#~ "  i: Informationen Ã¼ber ein oder mehrere Pakete anzeigen\n"
+#~ "     die Paketnamen sollten nach dem Â»iÂ« folgen\n"
+#~ "  c: das Debian-Ã„nderungsprotokoll eines Pakets anzeigen\n"
+#~ "     der/die Paketnamen sollten nach dem Â»cÂ« folgen\n"
+#~ "  d: Anzeige von AbhÃ¤ngigkeitsinfos ein/aus\n"
+#~ "  s: Anzeige der GrÃ¶ÃŸenverÃ¤nderungen ein/aus\n"
+#~ "  v: Anzeige der Versionen ein/aus\n"
+#~ "  e: die visuelle OberflÃ¤che starten\n"
+#~ "\n"
+#~ "  Sie kÃ¶nnen auch Ã„nderungen an den geplanten Aktionen vornehmen.\n"
+#~ "  Dazu geben Sie einen Befehlsbuchstaben gefolgt von einem oder mehreren\n"
+#~ "  Paketnamen oder -mustern ein.  Der Befehl wird auf alle Pakete "
+#~ "angewandt.\n"
+#~ "  (Sie kÃ¶nnen auch zusÃ¤tzliche Befehle angeben;  jeder wird auf alle "
+#~ "folgenden\n"
+#~ "  Pakete angewandt.)\n"
+#~ "\n"
+#~ "Befehle:\n"
+#~ "  + : Installieren\n"
+#~ "  - : Entfernen\n"
+#~ "  _ : VollstÃ¤ndig entfernen (Â»purgeÂ«, auch Konfigurationsdateien "
+#~ "lÃ¶schen)\n"
+#~ "  = : ZurÃ¼ckhalten\n"
 
 #  Use apt-get's familiar error message,
 #  Use apt-get's familiar error message,

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	Sun May  1 17:18:21 2005
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_po_el\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-08-11 14:24+0300\n"
 "Last-Translator: George Papamichelakis <george at step.gr>\n"
 "Language-Team:  <debian-l10n-greek at lists.debian.org>\n"
@@ -171,7 +171,7 @@
 "Î‘Ï…Ï„ÏŒÎ¼Î±Ï„Î· Î±Ï†Î±Î¯ÏÎµÏƒÎ· Î±Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Ï€Î¿Ï… Ï„Î±Î¹ÏÎ¹Î¬Î¶Î¿Ï…Î½ ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï†Î¯Î»Ï„ÏÎ¿"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Î•Î½Ï„Î¬Î¾ÎµÎ¹"
@@ -314,52 +314,52 @@
 "Î£Î·Î¼ÎµÎ¯Ï‰ÏƒÎ·: ÎµÏ€Î¹Î»ÎÏ‡Î¸Î·ÎºÎµ Ï„Î¿ \"%s\" ÏƒÏ„Î· Î¸ÎÏƒÎ· Ï„Î¿Ï…\n"
 "      ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ¿Ï Ï€Î±ÎºÎÏ„Î¿Ï… \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "Ï„Î¿ %s ÎµÎ¯Î½Î±Î¹ Î®Î´Î· ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿ ÎºÎ±Î¹ ÏƒÏ„Î·Î½ Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½Î· ÎÎºÎ´Î¿ÏƒÎ· (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "Ï„Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿, Î¬ÏÎ± Î´ÎµÎ½ Î¸Î± ÎµÏ€Î±Î½ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Î¤Î¿ Ï€Î±ÎºÎÏ„Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿, Î¬ÏÎ± Î´ÎµÎ½ Î¸Î± Î±Ï†Î±Î¹ÏÎµÎ¸ÎµÎ¯\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Î¤Î¿ Ï€Î±ÎºÎÏ„Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿, Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î±Ï€Î±Î³Î¿ÏÎµÏ…Ï„ÎµÎ¯ Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Î¤Î¿ Ï€Î±ÎºÎÏ„Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î²Î±Î¸Î¼Î¯ÏƒÎ¹Î¼Î¿, Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î±Ï€Î±Î³Î¿ÏÎµÏ…Ï„ÎµÎ¯ Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Î£Î·Î¼ÎµÎ¯Ï‰ÏƒÎ·: ÎµÏ€Î¹Î»ÎÏ‡Î¸Î·ÎºÎµ Î¿ ÏƒÎºÎ¿Ï€ÏŒÏ‚ \"%s: %s\" Î³Î¹Î± ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 "Î”ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ ÎÎºÎ´Î¿ÏƒÎ· Ï€Î±ÎºÎÏ„Î¿Ï… Î¼Îµ Ï„Î·Î½ ÎµÎ½Ï„Î¿Î»Î® ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "Î”ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï… Ï€Î±ÎºÎÏ„Î¿Ï… Î¼Îµ Ï„Î·Î½ ÎµÎ½Ï„Î¿Î»Î® "
 "ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -368,7 +368,7 @@
 "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Ï„Î¿ Ï€Î±ÎºÎÏ„Î¿ \"%s\", ÎºÎ±Î¹ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± Î±Ï€ÏŒ 40\n"
 "Ï€Î±ÎºÎÏ„Î± Ï€ÎµÏÎ¹ÎÏ‡Î¿Ï…Î½ Ï„Î¿ \"%s\" ÏƒÏ„Î¿ ÏŒÎ½Î¿Î¼Î¬ Ï„Î¿Ï…Ï‚.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -377,12 +377,12 @@
 "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Ï„Î¿ Ï€Î±ÎºÎÏ„Î¿ \"%s\".  Î Î¬ÏÎ±Ï…Ï„Î± Ï„Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î±\n"
 "Ï€Î±ÎºÎÏ„Î± Ï€ÎµÏÎ¹ÎÏ‡Î¿Ï…Î½ \"%s\" ÏƒÏ„Î¿ ÏŒÎ½Î¿Î¼Î¬ Ï„Î¿Ï…Ï‚:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Ï€Î±ÎºÎÏ„Î¿ Î¼Îµ ÏŒÎ½Î¿Î¼Î± Î® Ï€ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï€Î¿Ï… Î½Î± Ï„Î±Î¹ÏÎ¹Î¬Î¶ÎµÎ¹ ÏƒÏ„Î¿ \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -391,7 +391,7 @@
 "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Ï€Î±ÎºÎÏ„Î¿ Î½Î± Ï„Î±Î¹ÏÎ¹Î¬Î¶ÎµÎ¹ ÏƒÏ„Î¿ \"%s\", ÎºÎ±Î¹ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± Î±Ï€ÏŒ 40\n"
 "Ï€Î±ÎºÎÏ„Î± Ï€ÎµÏÎ¹ÎÏ‡Î¿Ï…Î½ Ï„Î¿ \"%s\" ÏƒÏ„Î·Î½ Ï€ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï…Ï‚.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -400,6 +400,11 @@
 "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Ï€Î±ÎºÎÏ„Î¿ Î½Î± Ï„Î±Î¹ÏÎ¹Î¬Î¶ÎµÎ¹ ÏƒÏ„Î¿ \"%s\".  Î Î¬ÏÎ±Ï…Ï„Î±, Ï„Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î±\n"
 "Ï€Î±ÎºÎÏ„Î± Ï€ÎµÏÎ¹ÎÏ‡Î¿Ï…Î½ Ï„Î¿ \"%s\" ÏƒÏ„Î·Î½ Ï€ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï…Ï‚:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "ÎšÎ±ÎºÏŒÏ‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎ±Ï‚ ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚ '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Ï€ÏÏŒÎ³ÏÎ±Î¼Î¼Î± ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚, ÎµÎ¯Î½Î±Î¹ ÏƒÏ‰ÏƒÏ„Î¬ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿ Ï„Î¿ ÏƒÏÏƒÏ„Î·Î¼Î±;"
@@ -441,7 +446,7 @@
 msgid "Invalid operation %s"
 msgstr "Î‘ÎºÏ…ÏÎ· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -453,16 +458,16 @@
 msgstr ""
 "Î¼ÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ·: Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ ÎÎ½Î± Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ Ï€Î±ÎºÎÏ„Î¿ Î³Î¹Î± ÎºÎ±Ï„ÎÎ²Î±ÏƒÎ¼Î±\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î±Î½Î¬Î³Î½Ï‰ÏƒÎ· Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚ Ï€Î·Î³ÏŽÎ½  "
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Ï€Î±ÎºÎÏ„Î¿ Î¼Îµ ÏŒÎ½Î¿Î¼Î± \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -519,96 +524,96 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Î¤Î¹ ÎµÎ¯Î½Î±Î¹;  Î•Î¯Î½Î±Î¹ ÎÎ½Î± ÎµÎ»ÎµÏ†Î±Î½Ï„Î¿ÎµÎ¹Î´ÎÏ‚ Ï€Î¿Ï… Ï„Î¿ Ï„ÏÏŽÎµÎ¹ ÎÎ½Î± Ï†Î¯Î´Î¹, Ï†Ï…ÏƒÎ¹ÎºÎ¬.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î±Î½Î¬Î³Î½Ï‰ÏƒÎ· Ï„Î¿Ï… ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… Ï„Ï‰Î½ Ï€Î·Î³ÏŽÎ½"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "Î±Î»Î»Î¬ Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯ Ï„Î¿ %s."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "Î±Î»Î»Î¬ Ï„Î¿ %s ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿ ÎºÎ±Î¹ ÎµÎ¾Î±Î¹ÏÎµÎ¯Ï„Î±Î¹."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "Î±Î»Î»Î¬ Ï„Î¿ %s ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "Î±Î»Î»Î¬ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ¹Î¼Î¿"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " Ï„Î¿ Î¿Ï€Î¿Î¯Î¿ ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÏŒ Ï€Î±ÎºÎÏ„Î¿."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " Î®"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± ÎµÎ¯Î½Î±Î¹ Î•Î›Î‘Î¤Î¤Î©ÎœÎ‘Î¤Î™ÎšÎ‘:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± Î´ÎµÎ½ Ï‡ÏÎµÎ¹Î¬Î¶Î¿Î½Ï„Î±Î¹ ÎºÎ±Î¹ Î¸Î± Î‘Î¦Î‘Î™Î¡Î•Î˜ÎŸÎ¥Î:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± ÎµÎ¾Î±Î¹ÏÎÎ¸Î·ÎºÎ±Î½ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± ÎÎ•Î‘ Ï€Î±ÎºÎÏ„Î± Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± Î¸Î± Î‘Î¦Î‘Î™Î¡Î•Î˜ÎŸÎ¥Î Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± Î¸Î± Î¥Î ÎŸÎ’Î‘Î˜ÎœÎ™Î£Î¤ÎŸÎ¥Î Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± ÎÏ‡Î¿Ï…Î½ ÎµÎ¾Î±Î¹ÏÎµÎ¸ÎµÎ¯:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± Î¸Î± Î•Î Î‘ÎÎ•Î“ÎšÎ‘Î¤Î‘Î£Î¤Î‘Î˜ÎŸÎ¥Î:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± ÎÎ•Î‘ Ï€Î±ÎºÎÏ„Î± Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± Î¸Î± Î‘Î¦Î‘Î™Î¡Î•Î˜ÎŸÎ¥Î:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± Î¸Î± Î±Î½Î±Î²Î±Î¸Î¼Î¹ÏƒÏ„Î¿ÏÎ½:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Î‘Î Î‘Î¡Î‘Î™Î¤Î—Î¤Î‘ Ï€Î±ÎºÎÏ„Î± Î¸Î± Î‘Î¦Î‘Î™Î¡Î•Î˜ÎŸÎ¥Î!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Î‘Î Î‘Î¡Î‘Î™Î¤Î—Î¤Î‘ Ï€Î±ÎºÎÏ„Î± Î¸Î± Î³Î¯Î½Î¿Ï…Î½ Î•Î›Î‘Î¤Î©ÎœÎ‘Î¤Î™ÎšÎ‘ Î±Ï€ÏŒ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ½ÎÏÎ³ÎµÎ¹Î±:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -617,101 +622,229 @@
 "Î Î¡ÎŸÎ•Î™Î”ÎŸÎ ÎŸÎ™Î—Î£Î—: Î‘Ï…Ï„Î® Î· ÎµÎ½ÎÏÎ³ÎµÎ¹Î± Î¸Î± Ï€ÏÎ¿Î¾ÎµÎ½Î®ÏƒÎµÎ¹ Î´Ï…ÏƒÎ»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯ÎµÏ‚ ÏƒÏ„Î¿ ÏƒÏÏƒÏ„Î·Î¼Î±!\n"
 "         ÎœÎ—Î ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ÎµÎºÏ„ÏŒÏ‚ Î±Î½ Î³Î½Ï‰ÏÎ¯Î¶ÎµÏ„Îµ Î‘ÎšÎ¡Î™Î’Î©Î£ Ï„Î¹ ÎºÎ¬Î½ÎµÏ„Îµ!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "ÎÎ±Î¹ Î³Î½Ï‰ÏÎ¯Î¶Ï‰ ÏŒÏ„Î¹ ÎµÎ¯Î½Î±Î¹ Î¼Î¹Î± Ï€Î¿Î»Ï ÎºÎ±ÎºÎ® Î¹Î´ÎÎ±"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Î“Î¹Î± Î½Î± ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ, Ï€Î»Î·ÎºÏ„ÏÎ¿Î»Î¿Î³Î®ÏƒÏ„Îµ Ï„Î·Î½ Ï†ÏÎ¬ÏƒÎ· \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "ÎÎ±Î¹"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "ÎŸÏ‡Î¹"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Î“Î¹Î± Î½Î± ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ, Ï€Î»Î·ÎºÏ„ÏÎ¿Î»Î¿Î³Î®ÏƒÏ„Îµ Ï„Î·Î½ Ï†ÏÎ¬ÏƒÎ· \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± ÎµÎ¯Î½Î±Î¹ Î Î¡ÎŸÎ¤Î•Î™ÎÎŸÎœÎ•ÎÎ‘ Î±Î»Î»Î¬ Î”Î•Î Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± ÎµÎ¯Î½Î±Î¹ Î Î¡ÎŸÎ¤Î•Î™ÎÎŸÎœÎ•ÎÎ‘ Î±Î»Î»Î¬ Î”Î•Î Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Î”ÎµÎ½ Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½, Î±Î½Î±Î²Î±Î¸Î¼Î¹ÏƒÏ„Î¿ÏÎ½ Î® Î±Ï†Î±Î¹ÏÎµÎ¸Î¿ÏÎ½ Ï€Î±ÎºÎÏ„Î±.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu Ï€Î±ÎºÎÏ„Î± Î±Î½Î±Î²Î±Î¸Î¼Î¯Î¶Î¿Î½Ï„Î±Î¹, %lu Î½ÎÎ¿-ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î±, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ÎµÏ€ÎµÎ½ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î±, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu Ï…Ï€Î¿Î²Î±Î¸Î¼Î¹ÏƒÎ¼ÎÎ½Î±, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu Î³Î¹Î± Î±Ï†Î±Î¯ÏÎµÏƒÎ· ÎºÎ±Î¹ %lu Î´ÎµÎ½ Î±Î½Î±Î²Î±Î¸Î¼Î¯ÏƒÏ„Î·ÎºÎ±Î½.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Î§ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ Î½Î± ÎºÎ±Ï„ÎµÎ²Î¿ÏÎ½ %sB/%sB Î±ÏÏ‡ÎµÎ¯Ï‰Î½. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Î§ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ Î½Î± ÎºÎ±Ï„ÎµÎ²Î¿ÏÎ½ %sB Î±ÏÏ‡ÎµÎ¯Ï‰Î½. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "ÎœÎµÏ„Î¬ Ï„Î·Î½ Î±Ï€Î¿ÏƒÏ…Î¼Ï€Î¯ÎµÏƒÎ· Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸Î¿ÏÎ½ %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "ÎœÎµÏ„Î¬ Ï„Î·Î½ Î±Ï€Î¿ÏƒÏ…Î¼Ï€Î¯ÎµÏƒÎ· Î¸Î± ÎµÎ»ÎµÏ…Î¸ÎµÏÏ‰Î¸Î¿ÏÎ½ %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "ÎšÎ±ÎºÏŒÏ‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎ±Ï‚ ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚ '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ Ï€Î±ÎºÎÏ„Î± Î³Î¹Î± ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ· -- Î´ÏŽÏƒÏ„Îµ Ï„Î± Î¿Î½ÏŒÎ¼Î±Ï„Î± Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Î¼ÎµÏ„Î¬ Ï„Î¿ "
 "'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Î Î±Ï„Î®ÏƒÏ„Îµ Return Î³Î¹Î± ÏƒÏ…Î½ÎÏ‡ÎµÎ¹Î±"
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎ±Î½ Ï€Î±ÎºÎÏ„Î± -- Î³ÏÎ¬ÏˆÏ„Îµ Ï„Î± Î¿Î½ÏŒÎ¼Î±Ï„Î± Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Î¼ÎµÏ„Î¬ Ï„Î¿ 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Î Î±Ï„Î®ÏƒÏ„Îµ Return Î³Î¹Î± ÏƒÏ…Î½ÎÏ‡ÎµÎ¹Î±"
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "ÎœÎ¿ÏÏ†Î® ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ Î³Î¹Î± Ï„Î¹Ï‚ Î¿Î¸ÏŒÎ½ÎµÏ‚ Ï€Î±ÎºÎÏ„Ï‰Î½"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·/Î‘Ï†Î±Î¯ÏÎµÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± ÎÎ•Î‘ Ï€Î±ÎºÎÏ„Î± Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·/Î‘Ï†Î±Î¯ÏÎµÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "ÎžÎÏ‡Î±ÏƒÎµ Ï„Î± Î½ÎÎ± Ï€Î±ÎºÎÏ„Î±"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Î¤Î¿Ï€Î¿Î¸ÎÏ„Î·ÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½ ÏƒÎµ Î±Î½Î±Î¼Î¿Î½Î®\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr "markauto    - Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ ÏƒÎ±Î½ Î½Î± ÎÏ‡Î¿Ï…Î½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+"unmarkauto   - Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ ÏƒÎ±Î½ Î½Î± ÎÏ‡Î¿Ï…Î½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î±\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "ÏƒÏ…Î½Î¹ÏƒÏ„Î¬"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Î˜ÎÎ»ÎµÏ„Îµ Î½Î± ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ; [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -722,7 +855,7 @@
 "Î˜Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -733,7 +866,7 @@
 "Î”ÎµÎ½ Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -744,7 +877,7 @@
 "Î˜Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÏ‰Î½.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -755,7 +888,7 @@
 "Î”ÎµÎ½ Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÏ‰Î½.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -766,7 +899,7 @@
 "Î˜Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î±Î»Î»Î±Î³Î®Ï‚ Î¼ÎµÎ³ÎµÎ¸ÏŽÎ½.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -777,130 +910,105 @@
 "Î”ÎµÎ½ Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î±Î»Î»Î±Î³Î®Ï‚ Î¼ÎµÎ³ÎµÎ¸ÏŽÎ½.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Î•Î½Ï„Î¿Î»ÎÏ‚:\n"
-"  y: ÏƒÏ…Î½ÎÏ‡ÎµÎ¹Î± Ï„Î·Ï‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚\n"
-"  n: Î±ÎºÏÏÏ‰ÏƒÎ· ÎºÎ±Î¹ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·\n"
-"  i: ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¹ÏŽÎ½ Î³Î¹Î± ÎÎ½Î± Î® Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± Ï€Î±ÎºÎÏ„Î±\n"
-"     Ï„Î± Î¿Î½ÏŒÎ¼Î±Ï„Î± Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Ï„Î¿ 'i'.\n"
-"  d: Î±Ï€/ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½\n"
-"  s: Î±Ï€/ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ Î±Î»Î»Î±Î³ÏŽÎ½ ÏƒÏ„Î± Î¼ÎµÎ³ÎÎ¸Î· Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½\n"
-"  v: Î±Ï€/ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ ÎµÎºÎ´ÏŒÏƒÎµÏ‰Î½\n"
-"  e: Î±Î»Î»Î±Î³Î® ÏƒÎµ Î¿Ï€Ï„Î¹ÎºÎ® Î´Î¹Î±ÏƒÏÎ½Î´ÎµÏƒÎ·\n"
-"\n"
-"  ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î±ÎºÏŒÎ¼Î± Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ Î¼ÎµÏ„Î±Ï„ÏÎ¿Ï€ÎÏ‚ ÏƒÏ„Î¿ ÏƒÏÎ½Î¿Î»Î¿ Ï„Ï‰Î½ ÎµÎ½ÎµÏÎ³ÎµÎ¹ÏŽÎ½.\n"
-"  Î Î»Î·ÎºÏ„ÏÎ¿Î»Î¿Î³Î®ÏƒÏ„Îµ ÎÎ½Î±Î½ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎ± ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚, Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ¼ÎµÎ½Î¿ Î±Ï€ÏŒ ÎÎ½Î± Î® "
-"Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±\n"
-"Î¿Î½ÏŒÎ¼Î±Ï„Î± Ï€Î±ÎºÎÏ„Ï‰Î½.  Î— ÎµÎ½ÎÏÎ³ÎµÎ¹Î± Î¸Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯ ÏƒÎµ ÏŒÎ»Î± Ï„Î± Ï€Î±ÎºÎÏ„Î±. (Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ\n"
-"Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ ÎºÎ±Î¹ ÎµÏ€Î¹Ï€Î»ÎÎ¿Î½ ÎµÎ½ÎÏÎ³ÎµÎ¹ÎµÏ‚, ÎºÎ¬Î¸Îµ Î¼Î¹Î± Î¸Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯ ÏƒÎµ ÏŒÎ»Î± Ï„Î±\n"
-"Ï€Î±ÎºÎÏ„Î± Ï€Î¿Ï… Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½)\n"
-"\n"
-"Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚:\n"
-"  + : Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·\n"
-"  - : Î‘Ï†Î±Î¯ÏÎµÏƒÎ·\n"
-"  _ : Î”Î¹Î±Î³ÏÎ±Ï†Î®\n"
-"  = : ÎšÏÎ¬Ï„Î·Î¼Î±\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Î‘ÎºÏ…ÏÎ· Î±Ï€Î¬Î½Ï„Î·ÏƒÎ·.  Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Î¼Î¹Î± ÎÎ³ÎºÏ…ÏÎ· ÎµÎ½Ï„Î¿Î»Î® Î® '?' Î³Î¹Î± Î²Î¿Î®Î¸ÎµÎ¹Î±.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "ÎˆÎ¾Î¿Î´Î¿Ï‚ Î±Ï€ÏŒ Ï„Î¿ Ï€ÏÏŒÎ³ÏÎ±Î¼Î¼Î±"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± ÎÏ‡Î¿Ï…Î½ Î±Î½ÎµÏ€Î¯Î»Ï…Ï„ÎµÏ‚ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÎ¹Ï‚:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Î¤Î± Î±ÎºÏŒÎ»Î¿Ï…Î¸Î± Ï€Î±ÎºÎÏ„Î± ÎµÎ¯Î½Î±Î¹ Î•Î›Î‘Î¤Î¤Î©ÎœÎ‘Î¤Î™ÎšÎ‘:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Î‘Î´ÏÎ½Î±Ï„Î¿ Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… %s Î³Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î®"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î® ÏƒÏ„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Î‘ÎºÏ…ÏÎ· Î±Ï€Î¬Î½Ï„Î·ÏƒÎ·.  Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Î¼Î¹Î± ÎÎ³ÎºÏ…ÏÎ· ÎµÎ½Ï„Î¿Î»Î® Î® '?' Î³Î¹Î± Î²Î¿Î®Î¸ÎµÎ¹Î±.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Î‘ÎºÏ…ÏÎ· Î±Ï€Î¬Î½Ï„Î·ÏƒÎ·.  Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Î¼Î¹Î± ÎÎ³ÎºÏ…ÏÎ· ÎµÎ½Ï„Î¿Î»Î® Î® '?' Î³Î¹Î± Î²Î¿Î®Î¸ÎµÎ¹Î±.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·: Î˜Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î¿ÏÎ¯ÏƒÎµÏ„Îµ ÎÎ½Î± Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ Î±Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿\n"
@@ -1195,7 +1303,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î¿ Î¿ ÎºÎ±Î¸Î±ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… Ï†Î±ÎºÎÎ»Î¿Ï… Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Î”Î¹Î±Î³ÏÎ¬Ï†Î¿Î½Ï„Î±Î¹ Ï„Î± Ï€ÎµÏÎ¹Ï„Ï„Î¬ Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„Ï‰Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î±"
 
@@ -1487,26 +1595,21 @@
 msgstr ""
 "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î´Î¹ÏŒÏÎ¸Ï‰ÏƒÎ· Ï„Ï‰Î½ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½, ÎºÎ¬Ï€Î¿Î¹Î± Ï€Î±ÎºÎÏ„Î± Î´ÎµÎ½ Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î±Î½Î¬Î³Î½Ï‰ÏƒÎ· Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚ Ï€Î·Î³ÏŽÎ½."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Î‘Î´ÏÎ½Î±Ï„Î¿ Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Î® Î· Î±Î½Î¬Î»Ï…ÏƒÎ· Ï„Ï‰Î½ Î»Î¹ÏƒÏ„ÏŽÎ½ Ï€Î±ÎºÎÏ„Ï‰Î½ Î® Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "ÎŠÏƒÏ‰Ï‚ Î½Î± Ï‡ÏÎµÎ¹Î±ÏƒÏ„ÎµÎ¯ Î½Î± ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÎµÏ„Îµ Ï„Î¹Ï‚ Î»Î¯ÏƒÏ„ÎµÏ‚ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Î³Î¹Î± Î½Î± Î´Î¹Î¿ÏÎ¸ÏŽÏƒÎµÏ„Îµ "
 "Î±Ï…Ï„Î¬ Ï„Î± Î±Î³Î½Î¿Î¿ÏÎ¼ÎµÎ½Î± Î±ÏÏ‡ÎµÎ¯Î±."
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Î‘Î´ÏÎ½Î±Ï„Î¿ Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… %s Î³Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î®"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1781,17 +1884,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ· Ï€Î¿Î»Î¹Ï„Î¹ÎºÎ® Ï„Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ·Ï‚ '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s Î¼ÎµÏ„Î±Î³Î»Ï‰Ï„Ï„Î¯ÏƒÏ„Î·ÎºÎµ ÏƒÏ„Î¹Ï‚ %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Î ÏÏŒÎ³ÏÎ±Î¼Î¼Î± Î¼ÎµÏ„Î±Î³Î»ÏŽÏ„Ï„Î¹ÏƒÎ·Ï‚ : g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1800,7 +1903,7 @@
 "\n"
 "Î•ÎºÎ´Î¿ÏƒÎ· NCurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1809,22 +1912,22 @@
 "\n"
 "Î•ÎºÎ´Î¿ÏƒÎ· Curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "ÎµÎºÎ´Î¿ÏƒÎ· libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Î§ÏÎ®ÏƒÎ·: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [ÎµÏ€Î¹Î»Î¿Î³ÎÏ‚] <ÎµÎ½ÎÏÎ³ÎµÎ¹Î±> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1834,43 +1937,43 @@
 "Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·/Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ· Ï€Î±ÎºÎÏ„Î¿Ï…\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Î‘Ï†Î±Î¯ÏÎµÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Î‘Ï†Î±Î¯ÏÎµÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½ Î¼Î±Î¶Î¯ Î¼Îµ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏŽÎ½ Ï„Î¿Ï…Ï‚\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Î¤Î¿Ï€Î¿Î¸ÎÏ„Î·ÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½ ÏƒÎµ Î±Î½Î±Î¼Î¿Î½Î®\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Î‘ÎºÏÏÏ‰ÏƒÎ· Ï„Î·Ï‚ ÎµÎ½Ï„Î¿Î»Î®Ï‚ Î±Î½Î±Î¼Î¿Î½Î® Î³Î¹Î± Ï€Î±ÎºÎÏ„Î¿\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr "markauto    - Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ ÏƒÎ±Î½ Î½Î± ÎÏ‡Î¿Ï…Î½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 "unmarkauto   - Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ ÏƒÎ±Î½ Î½Î± ÎÏ‡Î¿Ï…Î½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î±\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1879,17 +1982,17 @@
 " forbid-version - Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· Ï„Î·Ï‚ Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·Ï‚ ÎµÎ½ÏŒÏ‚ Ï€Î±ÎºÎÏ„Î¿Ï… ÏƒÎµ Î¼Î¹Î± "
 "ÏƒÏ…Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î· ÎÎºÎ´Î¿ÏƒÎ·.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr "update       - ÎœÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· Î»Î¹ÏƒÏ„ÏŽÎ½ Ï„Ï‰Î½ Î½ÎÏ‰Î½/Î±Î½Î±Î²Î±Î¸Î¼Î¹Î¶ÏŒÎ¼ÎµÎ½Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Î¼Î¹Î±Ï‚ Î±ÏƒÏ†Î±Î»Î¿ÏÏ‚ Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·Ï‚\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1898,60 +2001,60 @@
 " dist-upgrade - Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Î¼Î¹Î±Ï‚ Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·Ï‚, Î¼Îµ Ï€Î¹Î¸Î±Î½Î® Ï€ÏÎ¿ÏƒÎ¸Î®ÎºÎ· ÎºÎ±Î¹ Î±Ï†Î±Î¯ÏÎµÏƒÎ· "
 "Ï€Î±ÎºÎÏ„Ï‰Î½\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr "forget-new   - ÎžÎÏ‡Î±ÏƒÎµ Ï€Î¿Î¹Î± Ï€Î±ÎºÎÏ„Î± ÎµÎ¯Î½Î±Î¹ \"Î½ÎÎ±\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 " search       - Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ· ÎµÎ½ÏŒÏ‚ Ï€Î±ÎºÎÏ„Î¿Ï… Î¼Îµ Î²Î¬ÏƒÎ· Ï„Î¿ ÏŒÎ½Î¿Î¼Î± Î®/ÎºÎ±Î¹ ÎÎºÏ†ÏÎ±ÏƒÎ·\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î»ÎµÏ€Ï„Î¿Î¼ÎµÏÎµÎ¹ÏŽÎ½ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ ÎÎ½Î± Ï€Î±ÎºÎÏ„Î¿\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Î”Î¹Î±Î³ÏÎ±Ï†Î® Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„Î¿Î¼ÎÎ½Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Î”Î¹Î±Î³ÏÎ±Ï†Î® Ï€Î±Î»Î±Î¹ÏŒÏ„ÎµÏÎ± Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„Î¿Î¼ÎÎ½Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Î± Ï€Î±ÎºÎÏ„Ï‰Î½\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " Î·Î¼ÎµÏ. Î±Î»Î»Î±Î³ÏŽÎ½    -Î•Î¼Ï†Î¬Î½Î¹ÏƒÎµ Ï„Î¿ Î·Î¼ÎµÏÎ¿Î»ÏŒÎ³Î¹Î¿ Î±Î»Î»Î±Î³ÏŽÎ½ ÎµÎ½ÏŒÏ‚ Ï€Î±ÎºÎÏ„Î¿Ï…\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - ÎœÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· ÎµÎ½ÏŒÏ‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï… .deb Î³Î¹Î± ÎÎ½Î± Ï€Î±ÎºÎÏ„Î¿\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Î•Ï€Î¹Î»Î¿Î³ÎÏ‚:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Î‘Ï…Ï„ÏŒ Ï„Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Î²Î¿Î®Î¸ÎµÎ¹Î±Ï‚\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Î•Î¾Î¿Î¼Î¿Î¯Ï‰ÏƒÎ· ÎµÎ½ÎµÏÎ³ÎµÎ¹ÏŽÎ½, Î±Î»Î»Î¬ Î½Î± Î¼Î·Î½ Ï€ÏÎ±Î³Î¼Î±Ï„Î¿Ï€Î¿Î¹Î·Î¸Î¿ÏÎ½ ÏƒÏ„Î·Î½ "
 "Ï€ÏÎ±Î³Î¼Î±Ï„Î¹ÎºÏŒÏ„Î·Ï„Î±.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1959,19 +2062,19 @@
 " -d             ÎœÏŒÎ½Î¿ Î¼ÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½, Î½Î± Î¼Î·Î½ Î³Î¯Î½ÎµÎ¹ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î® "
 "Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÎºÎ¬Ï„Î¹.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr "-P             ÎÎ± Î³Î¯Î½Î¿Î½Ï„Î±Î¹ Ï€Î¬Î½Ï„Î± ÎµÏÏ‰Ï„Î®ÏƒÎµÎ¹Ï‚ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚ Î® ÎµÎ½ÎÏÎ³ÎµÎ¹ÎµÏ‚\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 "-y            Î¥Ï€ÎÎ¸ÎµÏƒÎµ ÏŒÏ„Î¹ Î· Î±Ï€Î¬Î½Ï„Î·ÏƒÎ· ÏƒÎµ Î±Ï€Î»ÎÏ‚ ÎµÏÏ‰Ï„Î®ÏƒÎµÎ¹Ï‚ Î½Î±Î¹/ÏŒÏ‡Î¹ ÎµÎ¯Î½Î±Î¹ 'Î½Î±Î¹'\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1980,7 +2083,7 @@
 "-F format      ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… Ï„ÏÏŒÏ€Î¿Ï… ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ Ï„Ï‰Î½ Î±Ï€Î¿Ï„ÎµÎ»ÎµÏƒÎ¼Î¬Ï„Ï‰Î½ Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚, "
 "Î´ÎµÎ¯Ï„Îµ ÎµÎ³Ï‡ÎµÎ¹ÏÎ¯Î´Î¹Î¿ Ï‡ÏÎ®ÏƒÎ·Ï‚\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1988,7 +2091,7 @@
 "-O order       ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… Ï„ÏÏŒÏ€Î¿Ï… Ï„Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ·Ï‚ Ï„Ï‰Î½ Î±Ï€Î¿Ï„ÎµÎ»ÎµÏƒÎ¼Î¬Ï„Ï‰Î½  Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚, "
 "Î´ÎµÎ¯Ï„Îµ Ï„Î¿ ÎµÎ³Ï‡ÎµÎ¹ÏÎ¯Î´Î¹Î¿ Ï‡ÏÎ®ÏƒÎ·Ï‚\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -1996,32 +2099,32 @@
 " -w width       ÎšÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… Ï€Î»Î¬Ï„Î¿Ï…Ï‚ ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ Ï„Ï‰Î½ Î±Ï€Î¿Ï„ÎµÎ»ÎµÏƒÎ¼Î¬Ï„Ï‰Î½ "
 "Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr "-f             Î•Ï€Î¹Î¸ÎµÏ„Î¹ÎºÎ® Ï€ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹Î± ÎµÏ€Î¯Î»Ï…ÏƒÎ·Ï‚ Ï„Ï‰Î½ ÏƒÏ€Î±ÏƒÎ¼ÎÎ½Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 "-V             Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Ï‰Î½ ÎµÎºÎ´ÏŒÏƒÎµÏ‰Î½ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Ï€Î¿Ï… Ï€ÏÏŒÎºÎµÎ¹Ï„Î±Î¹ Î½Î± "
 "ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 "-D             Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Ï‰Î½ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½ Ï„Ï‰Î½ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î± Î±Î»Î»Î±Î³Î¼ÎÎ½Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 "-Z\t\t    Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Î·Ï‚ Î±Î»Î»Î±Î³Î®Ï‚ Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ ÏƒÏ„Î¿ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿ ÎºÎ¬Î¸Îµ Ï€Î±ÎºÎÏ„Î¿Ï….\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -2029,7 +2132,7 @@
 "-v             Î•Î¼Ï†Î±Î½Î¯Î¶ÎµÎ¹ ÎµÏ€Î¹Ï€Î»ÎÎ¿Î½ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ (Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯ Ï€Î¿Î»Î»Î±Ï€Î»ÎÏ‚ "
 "Ï†Î¿ÏÎÏ‚)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -2037,12 +2140,12 @@
 " -t [release]   ÎŸÏÎ¯ÏƒÏ„Îµ Ï„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· Î±Ï€ÏŒ Ï€Î¿Î¹Î± Ï€Î±ÎºÎÏ„Î± Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± "
 "ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o key=val     Î†Î¼ÎµÏƒÎ¿Ï‚ ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î¼Î¹Î± Ï€Î±ÏÎ±Î¼ÎÏ„ÏÎ¿Ï… Î¼Îµ ÏŒÎ½Î¿Î¼Î± 'key'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2051,64 +2154,64 @@
 " --with(out)-recommends\tÎšÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î±Î½Ï„Î¹Î¼ÎµÏ„ÏŽÏ€Î¹ÏƒÎ·Ï‚ Ï„Ï‰Î½ ÏƒÏ…Î½Î¹ÏƒÏ„ÏŽÎ¼ÎµÎ½Ï‰Î½ Ï‰Ï‚\n"
 "                Î¹ÏƒÏ‡Ï…ÏÏŽÎ½ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fname: Î‘Î½Î¬Î³Î½Ï‰ÏƒÎ· Ï„Ï‰Î½ ÎµÎºÏ„ÎµÏ„Î±Î¼ÎÎ½Ï‰Î½ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¹ÏŽÎ½ Î±Ï€ÏŒ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ fname.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr "u       : ÎœÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· Î½ÎÎ±Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚ Ï€Î±ÎºÎÏ„Ï‰Î½ ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr "-i      : Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Î¼Î¹Î±Ï‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Î‘Ï…Ï„ÏŒ Ï„Î¿ APT ÎÏ‡ÎµÎ¹ Î”Ï…Î½Î¬Î¼ÎµÎ¹Ï‚ Î¥Ï€ÎµÏÎ‘Î³ÎµÎ»Î¬Î´Î±Ï‚.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o Î±Ï€Î±Î¹Ï„ÎµÎ¯ Î¼Î¹Î± Ï€Î±ÏÎ¬Î¼ÎµÏ„ÏÎ¿ Ï„Î·Ï‚ Î¼Î¿ÏÏ†Î®Ï‚ key=value, ÎÎ»Î±Î²Îµ %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "Î Î‘Î¡Î‘ÎžÎ•ÎÎŸ: ÎµÎ»Î®Ï†Î¸Î· Î¬Î³Î½Ï‰ÏƒÏ„Î¿Ï‚ ÎºÏŽÎ´Î¹ÎºÎ±Ï‚ Ï€Î±ÏÎ¬Î¼ÎµÏ„ÏÎ¿Ï…\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "ÎœÏŒÎ½Î¿ ÎÎ½Î± Î±Ï€ÏŒ Ï„Î¿ -u ÎºÎ±Î¹ i Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± Î¿ÏÎ¹ÏƒÏ„Î¿ÏÎ½\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "Ï„Î¿ -u ÎºÎ±Î¹ -i Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î¿ÏÎ¹ÏƒÏ„Î¿ÏÎ½ ÏƒÏ„Î· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± Î³ÏÎ±Î¼Î¼Î®Ï‚ ÎµÎ½Ï„Î¿Î»ÏŽÎ½(Ï€.Ï‡. Î¼Îµ "
 "Ï„Î¿ 'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "Ï„Î¿ -u ÎºÎ±Î¹ -i Î´ÎµÎ½ Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± Î¿ÏÎ¹ÏƒÏ„Î¿ÏÎ½ ÏƒÏ„Î·Î½ Î¯Î´Î¹Î± ÎµÎ½Ï„Î¿Î»Î®"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Î‘Î³Î½Ï‰ÏƒÏ„Î· ÎµÎ½Ï„Î¿Î»Î® \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2139,7 +2242,7 @@
 msgid "Lost"
 msgstr "Î•Ï‡Î±ÏƒÎµ"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "ÎÎ±ÏÎºÎ±Î»Î¹ÎµÏ…Ï„Î®Ï‚"
 
@@ -2319,7 +2422,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Î Î±ÎºÎÏ„Î¿"
 
@@ -3809,55 +3912,55 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Î§Î¼, Î´ÎµÎ½ Ï…Ï€Î®ÏÏ‡Î±Î½ Î»Î¬Î¸Î·, Î´Îµ Î¸Î± ÎÏ€ÏÎµÏ€Îµ Î½Î± ÏƒÏ…Î¼Î²Î±Î¯Î½ÎµÎ¹ Î±Ï…Ï„ÏŒ.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ· Ï„Î¿Ï…:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Î•Î¯ÏƒÏ„Îµ Î®Î´Î· Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Î— Ï…Ï€Î¿Î´Î¹ÎµÏÎ³Î±ÏƒÎ¯Î± Ï„ÎµÏÎ¼Î±Ï„Î¯ÏƒÏ„Î·ÎºÎµ Î¼Îµ ÏƒÏ†Î¬Î»Î¼Î± -- ÎµÎ¹ÏƒÎ¬Î³Î±Ï„Îµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ ÏƒÎ±Ï‚ ÏƒÏ‰ÏƒÏ„Î¬;"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Î¦ÏŒÏÏ„Ï‰ÏƒÎ· Ï„Î¿Ï… cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "ÎˆÎ¾Î¿Î´Î¿Ï‚ Î±Ï€ÏŒ Ï„Î¿ Aptitude; Î£Î¯Î³Î¿Ï…ÏÎ±;"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Î•Î¯ÏƒÏ„Îµ ÏƒÎ¯Î³Î¿Ï…ÏÎ¿Î¹ ÏŒÏ„Î¹ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î¹Ï‚ Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎÏ‚ ÏƒÎ±Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Î½Î± "
 "Ï†Î¿ÏÏ„ÏŽÏƒÎµÏ„Îµ Ï„Î¹Ï‚ Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½ÎµÏ‚;"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Î Î±ÎºÎÏ„Î±"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Ï‰Î½ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ ÎºÎ±Î¹ ÎµÏ€Î¹Î»Î¿Î³Î® ÎµÏÎ³Î±ÏƒÎ¹ÏŽÎ½"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3874,15 +3977,15 @@
 "ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î· Î´Î¹Î±Î½Î¿Î¼Î® Ï„Î¿Ï… Ï…Ï€ÏŒ ÏƒÏ…Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½ÎµÏ‚ Ï€ÏÎ¿Ï‹Ï€Î¿Î¸ÎÏƒÎµÎ¹Ï‚. Î”ÎµÎ¯Ï„Îµ Ï„Î¿\n"
 "'license' Î³Î¹Î± Î»ÎµÏ€Ï„Î¿Î¼ÎÏÎµÎ¹ÎµÏ‚."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3890,45 +3993,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Î£Ï…Î½ÎÏ‡ÎµÎ¹Î±"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Î ÏÎ¿ÎµÏ€Î¹ÏƒÎºÏŒÏ€Î·ÏƒÎ· Ï„Î·Ï‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÎºÎ±Î¹/Î® ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï„Ï‰Î½ ÎµÎ½ÎµÏÎ³ÎµÎ¹ÏŽÎ½ Ï€Î¿Ï… Î¸Î± ÎµÎºÏ„ÎµÎ»ÎµÏƒÏ„Î¿ÏÎ½"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Î ÏÎ¿Î·Î³"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "ÎšÎ¬Ï€Î¿Î¹Î± Ï€Î±ÎºÎÏ„Î± Î®Ï„Î±Î½ ÎºÎ±Ï„ÎµÏƒÏ„ÏÎ±Î¼Î¼ÎÎ½Î± ÎºÎ±Î¹ ÎÏ‡Î¿Ï…Î½ Î´Î¹Î¿ÏÎ¸Ï‰Î¸ÎµÎ¯"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3937,23 +4040,23 @@
 "Î— ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·/Î±Ï†Î±Î¯ÏÎµÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½ Î±Ï€Î±Î¹Ï„ÎµÎ¯ Ï€ÏÎ¿Î½ÏŒÎ¼Î¹Î± Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®, Ï€Î¿Ï… Î´ÎµÎ½\n"
 "ÎÏ‡ÎµÏ„Îµ Î±Ï…Ï„Î® Ï„Î· ÏƒÏ„Î¹Î³Î¼Î®.  Î˜Î± Î¸ÎÎ»Î±Ï„Îµ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Ï‰Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ root;\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "ÎœÎµÏ„Î±Ï„ÏÎ¿Ï€Î® ÏƒÎµ root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "ÎŸÏ‡Î¹ Î¼ÎµÏ„Î±Ï„ÏÎ¿Ï€Î® ÏƒÎµ root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "Î‰Î´Î· Î²ÏÎ¯ÏƒÎºÎµÏ„Î±Î¹ ÏƒÎµ ÎµÎ¾ÎÎ»Î¹Î¾Î· Î¼Î¹Î± Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î± Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·Ï‚ Î® ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚."
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Î”ÎµÎ½ ÎÏ‡Î¿Ï…Î½ ÎµÏ€Î¹Î»ÎµÎ³ÎµÎ¯ Ï€Î±ÎºÎÏ„Î± Î³Î¹Î± ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·, Î±Ï†Î±Î¯ÏÎµÏƒÎ· Î® Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3966,7 +4069,7 @@
 "Î±Î½Î±Î²Î±Î¸Î¼Î¯ÏƒÎµÏ„Îµ.\n"
 "Î Î»Î·ÎºÏ„ÏÎ¿Î»Î¿Î³Î®ÏƒÏ„Îµ \"U\" Î³Î¹Î± Î½Î± Ï€ÏÎ¿ÎµÏ„Î¿Î¹Î¼Î¬ÏƒÎµÏ„Îµ Î¼Î¹Î± Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3975,101 +4078,114 @@
 "Î— ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï„Ï‰Î½ Î»Î¹ÏƒÏ„ÏŽÎ½ Ï€Î±ÎºÎÏ„Ï‰Î½ Î±Ï€Î±Î¹Ï„ÎµÎ¯ Ï€ÏÎ¿Î½ÏŒÎ¼Î¹Î± Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®, Ï€Î¿Ï… Î´ÎµÎ½\n"
 "ÎÏ‡ÎµÏ„Îµ Î±Ï…Ï„Î® Ï„Î· ÏƒÏ„Î¹Î³Î¼Î®.  Î˜Î± Î¸ÎÎ»Î±Ï„Îµ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Ï‰Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ root;\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Î£ÎºÎ¿Ï„ÏŽÏƒÏ„Îµ Ï„Î·Î½ ÏŽÏÎ± ÏƒÎ±Ï‚ Î²ÏÎ¯ÏƒÎºÎ¿Î½Ï„Î±Ï‚ Î½Î¬ÏÎºÎµÏ‚"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Î”ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÎµÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· ÎºÎ±Ï„Î¬ Ï„Î· Î´Î¹Î¬ÏÎºÎµÎ¹Î± Ï„Î·Ï‚ Î¼ÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ·Ï‚"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "Î”Î¹Î±Î³ÏÎ¬Ï†Î¿Î½Ï„Î±Î¹ Ï„Î± Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„Ï‰Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Ï‰Î½"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Î¤Î± Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„Ï‰Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± ÎÏ‡Î¿Ï…Î½ Î´Î¹Î±Î³ÏÎ±Ï†ÎµÎ¯"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Î¤Î± Ï€ÎµÏÎ¹Ï„Ï„Î¬ Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„Ï‰Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± ÎÏ‡Î¿Ï…Î½ Î´Î¹Î±Î³ÏÎ±Ï†ÎµÎ¯"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Î£ÎºÎ¿Ï„ÏŽÏƒÏ„Îµ Ï„Î·Î½ ÏŽÏÎ± ÏƒÎ±Ï‚ Î²ÏÎ¯ÏƒÎºÎ¿Î½Ï„Î±Ï‚ Î½Î¬ÏÎºÎµÏ‚"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Î‘Î´ÏÎ½Î±Ï„Î¿ Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… %s Î³Î¹Î± ÎµÎ³Î³ÏÎ±Ï†Î®"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·/Î‘Ï†Î±Î¯ÏÎµÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "ÎŸÎ»Î¿ÎºÎ»Î®ÏÏ‰ÏƒÎ· ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ ÎµÎºÎºÏÎµÎ¼ÏŽÎ½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÏ‰Î½/Î±Ï†Î±Î¹ÏÎÏƒÎµÏ‰Î½"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "ÎˆÎ»ÎµÎ³Ï‡Î¿Ï‚ Î³Î¹Î± Î½ÎÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "ÎžÎÏ‡Î±ÏƒÎµ Ï„Î± Î½ÎÎ± Ï€Î±ÎºÎÏ„Î±"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "ÎžÎÏ‡Î±ÏƒÎµ Ï„Î± Ï€Î±ÎºÎÏ„Î± Ï€Î¿Ï… ÎµÎ¯Î½Î±Î¹ \"Î½ÎÎ±\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "Î•ÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· Ï„Î¿Ï… cache Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î® Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Ï€Î±ÎºÎÏ„Î¿Ï… Ï€Î¿Ï… ÎÏ‡Î¿Ï…Î½ Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„Ï‰Î¸ÎµÎ¯ Ï€ÏÎ¿Î·Î³Î¿Ï…Î¼ÎÎ½Ï‰Ï‚"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Î•ÎºÎºÎ±Î¸Î¬ÏÎ¹ÏƒÎ· ^Ï€ÎµÏÎ¹Ï„Ï„ÏŽÎ½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î® Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Ï€Î¿Ï… Î´ÎµÎ½ Î¼Ï€Î¿ÏÎ¿ÏÎ½ Ï€Î»ÎÎ¿Î½ Î½Î± Î¼ÎµÏ„Î±Ï†Î¿ÏÏ„Ï‰Î¸Î¿ÏÎ½"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Î£Î·Î¼ÎµÎ¯Ï‰ÏƒÎ· ^Î‘Î½Î±Î²Î±Î¸Î¼Î¹Î¶Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Î£Î·Î¼ÎµÎ¯Ï‰ÏƒÎ· ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Î±Î½Î±Î²Î±Î¸Î¼Î¹Î¶Î¿Î¼ÎÎ½Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Ï€Î¿Ï… Î´ÎµÎ½ ÎºÏÎ±Ï„Î¿ÏÎ½Ï„Î±Î¹ Ï€Î»ÎÎ¿Î½ Î³Î¹Î± "
 "Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "Î Î±Î¯Î¾Îµ ÎÎ±ÏÎºÎ±Î»Î¹ÎµÏ…Ï„Î®"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Î£ÏÎ½Î´ÎµÏƒÎ· Ï‰Ï‚ root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4078,69 +4194,69 @@
 "Î•ÎºÏ„ÎµÎ»ÎÏƒÏ„Îµ Ï„Î·Î½ ÎµÎ½Ï„Î¿Î»Î® 'su' Î³Î¹Î± Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Ï‰Ï‚ root.  Î‘Ï…Ï„Î® Î¸Î± Î¾Î±Î½Î±ÎµÎºÏ„ÎµÎ»ÎÏƒÎµÎ¹\n"
 "Ï„Î¿ Ï€ÏÏŒÎ³ÏÎ±Î¼Î¼Î± Î´Î¹Î±Ï„Î·ÏÏŽÎ½Ï„Î±Ï‚ Ï„Î¹Ï‚ Î´Î¹ÎºÎÏ‚ ÏƒÎ±Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "Î•Ï€Î±Î½Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· Ï„Î¿Ï… cache Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Î•Ï€Î±Î½Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ· Ï„Î¿Ï… cache Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "ÎˆÎ¾Î¿Î´Î¿Ï‚"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "ÎˆÎ¾Î¿Î´Î¿Ï‚ Î±Ï€ÏŒ Ï„Î¿ Ï€ÏÏŒÎ³ÏÎ±Î¼Î¼Î±"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Î‘Î½Î±Î¯ÏÎµÏƒÎ·"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ Ï„Î·Ï‚ Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î±Ï‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Î® Î¿Î¼Î¬Î´Î±Ï‚ ÎµÏÎ³Î±ÏƒÎ¹ÏŽÎ½ ÏƒÎµ Ï€Î±ÎºÎÏ„Î¿."
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Î¿Ï… Ï„ÏÎÏ‡Î¿Î½Ï„Î¿Ï‚ Ï€Î±ÎºÎÏ„Î¿Ï… Î³Î¹Î± ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î® Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Î‘Ï†Î±Î¯ÏÎµÏƒÎ·"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Î¿Ï… Ï„ÏÎÏ‡Î¿Î½Ï„Î¿Ï‚ Ï€Î±ÎºÎÏ„Î¿Ï… Î³Î¹Î± Î±Ï†Î±Î¯ÏÎµÏƒÎ·"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Î”Î¹Î±Î³ÏÎ±Ï†Î®"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Î¿Ï… Ï„ÏÎÏ‡Î¿Î½Ï„Î¿Ï‚ Ï€Î±ÎºÎÏ„Î¿Ï… ÎºÎ±Î¹ Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏŽÎ½ Ï„Î¿Ï… Î³Î¹Î± Î±Ï†Î±Î¯ÏÎµÏƒÎ·"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^ÎšÏÎ¬Ï„Î·ÏƒÎ·"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Î‘ÎºÏÏÏ‰ÏƒÎ· ÎºÎ¬Î¸Îµ ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚ Î³Î¹Î± Ï„Î¿ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿ Ï€Î±ÎºÎÏ„Î¿"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Î‘Î½Î±Î¼Î¿Î½Î®"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4148,11 +4264,11 @@
 "Î‘ÎºÏÏÏ‰ÏƒÎ· ÎºÎ¬Î¸Îµ ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚ Î³Î¹Î± Ï„Î¿ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿ Ï€Î±ÎºÎÏ„Î¿, ÎºÎ±Î¹ Ï€ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± Ï„Î¿Ï… Î±Ï€ÏŒ "
 "Î¼ÎµÎ»Î»Î¿Î½Ï„Î¹ÎºÎÏ‚ Î±Î½Î±Î²Î±Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "^Î‘Ï…Ï„ÏŒÎ¼Î±Ï„Î· Î£Î®Î¼Î±Î½ÏƒÎ·"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4161,11 +4277,11 @@
 "Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Î¿Ï… ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿Ï… Ï€Î±ÎºÎÏ„Î¿Ï… Ï‰Ï‚ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î± ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿Ï…. \n"
 "ÎÏ„ÏƒÎ¹ Î¸Î± Î±Ï†Î±Î¹ÏÎµÎ¸ÎµÎ¯ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î± ÏŒÏ„Î±Î½ Î´ÎµÎ½ Î¸Î± ÎµÎ¾Î±ÏÏ„ÏŽÎ½Ï„Î±Î¹ Î¬Î»Î»Î± Ï€Î±ÎºÎÏ„Î± Î±Ï€ÏŒ Î±Ï…Ï„ÏŒ."
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "^Î§ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î· Î£Î®Î¼Î±Î½ÏƒÎ·"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4174,11 +4290,11 @@
 "Î£Î®Î¼Î±Î½ÏƒÎ· Ï„Ï‰Î½ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Ï‰Ï‚ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î± ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Ï‰Î½. \n"
 "Î´ÎµÎ½ Î¸Î± Î±Ï†Î±Î¹ÏÎµÎ¸Î¿ÏÎ½ ÎµÎºÏ„ÏŒÏ‚ ÎºÎ±Î¹ Î±Î½ Ï„Î± Î±Ï†Î±Î¹ÏÎÏƒÎµÏ„Îµ ÎµÏƒÎµÎ¯Ï‚ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î±."
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Î‘Ï€Î±Î³ÏŒÏÎµÏ…ÏƒÎ· ÎÎºÎ´Î¿ÏƒÎ·Ï‚"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4188,215 +4304,215 @@
 "ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯\n"
 "Î½ÎµÏŽÏ„ÎµÏÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Ï„Î¿Ï…, Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸Î¿ÏÎ½ ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¬"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "Î ^Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎµ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Ï„Î¿ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿ Ï€Î±ÎºÎÏ„Î¿"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "Î‘^ÏÏ‡ÎµÎ¯Î¿ Î‘Î»Î»Î±Î³ÏŽÎ½"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎµ Ï„Î¿ Î·Î¼ÎµÏÎ¿Î»ÏŒÎ³Î¹Î¿ Î±Î»Î»Î±Î³ÏŽÎ½ Ï„Î¿Ï… Debian Î³Î¹Î± Ï„Î¿ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿ Ï€Î±ÎºÎÏ„Î¿"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Î•Ï…ÏÎµÏƒÎ·"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ· Î³Î¹Î± ÎÎ½Î± Ï€Î±ÎºÎÏ„Î¿"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Î’ÏÎÏ‚ ^ÎžÎ±Î½Î¬"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Î•Ï€Î±Î½Î¬Î»Î·ÏˆÎ· Ï„Î·Ï‚ Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î±Ï‚ Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Î ÎµÏÎ¹ÏŒÏÎ¹ÏƒÎµ Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ·"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Î•Ï†Î±ÏÎ¼Î¿Î³Î® Ï†Î¯Î»Ï„ÏÎ¿Ï… ÏƒÏ„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î§Ï‰ÏÎ¯Ï‚ Î ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼Î¿ÏÏ‚"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Î‘Ï†Î±Î¯ÏÎµÏƒÎ· Ï„Î¿Ï… Ï†Î¯Î»Ï„ÏÎ¿Ï… Î±Ï€ÏŒ Ï„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Î’ÏÎÏ‚ Î£^Ï€Î±ÏƒÎ¼ÎÎ½Î¿"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Î’ÏÎµÏ‚ Ï„Î¿ ÎµÏ€ÏŒÎ¼ÎµÎ½Î¿ Ï€Î±ÎºÎÏ„Î¿ Î¼Îµ Î±Î½ÎµÏ€Î¯Î»Ï…Ï„ÎµÏ‚ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÎ¹Ï‚"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ ^Î ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½Ï„Î¿Ï‚"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Î‘Î»Î»Î±Î³Î® Ï„Ï‰Î½ ÎµÏ€Î¹Î»Î¿Î³ÏŽÎ½ Ï€Î¿Ï… Î¼ÎµÏ„Î±Î²Î¬Î»Î¿Ï…Î½ Ï„Î¿ Ï€ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î•Î¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Î‘Î»Î»Î±Î³Î® Ï„Ï‰Î½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Ï€Î¿Ï… ÎµÏ€Î·ÏÎµÎ¬Î¶Î¿Ï…Î½ Ï„Î· Î´Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Ï„Ï‰Î½ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Î”Î¹Î¬Ï†Î¿ÏÎ±"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Î‘Î»Î»Î±Î³Î® Î´Î¹Î±Ï†ÏŒÏÏ‰Î½ ÎµÏ€Î¹Î»Î¿Î³ÏŽÎ½ Ï„Î¿Ï… Ï€ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±Ï„Î¿Ï‚"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ ÎµÏ€Î¹Î»Î¿Î³ÏŽÎ½"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ ÎµÏ€Î¹Î»Î¿Î³ÏŽÎ½ ÏƒÏ„Î¹Ï‚ Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½ÎµÏ‚ Ï„Î¹Î¼ÎÏ‚"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Î•Ï€ÏŒÎ¼ÎµÎ½Î¿"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÎµÏ€ÏŒÎ¼ÎµÎ½Î·Ï‚ Î¿Î¸ÏŒÎ½Î·Ï‚"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Î ÏÎ¿Î·Î³"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î·Ï‚ Î¿Î¸ÏŒÎ½Î·Ï‚"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î¿Î¸ÏŒÎ½Î·Ï‚"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "ÎÎÎ± Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ^Î Î±ÎºÎÏ„Î¿Ï…"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î½ÎÎ±Ï‚ Î¿Î¸ÏŒÎ½Î·Ï‚ ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ Ï€Î±ÎºÎÏ„Î¿Ï…"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÎÎÎ±Ï‚ ÎšÎ±Ï„Î·Î³Î¿ÏÎ¹Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î±ÎºÎÏ„Ï‰Î½ Î±Î½Î¬ ÎºÎ±Ï„Î·Î³Î¿ÏÎ¯Î±"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "Î£Ï‡ÎµÏ„Î¹ÎºÎ¬"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯Î±Ï‚ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Ï„Î¿ Ï€ÏÏŒÎ³ÏÎ±Î¼Î¼Î±"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Î’Î¿Î®Î¸ÎµÎ¹Î±"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Î·Ï‚ Î²Î¿Î®Î¸ÎµÎ¹Î±Ï‚ Ï„Î¿Ï… Ï€ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±Ï„Î¿Ï‚"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "ÎŸÎ´Î·Î³Î¯ÎµÏ‚ ^Î§ÏÎ®ÏƒÎ·Ï‚"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Ï‰Î½ Î±Î½Î±Î»Ï…Ï„Î¹ÎºÏŽÎ½ Î¿Î´Î·Î³Î¹ÏŽÎ½ Ï‡ÏÎ®ÏƒÎ·Ï‚"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Ï‰Î½ Ï€Î¹Î¿ ÏƒÏ…Ï‡Î½ÏŽÎ½ ÎµÏÏ‰Ï„Î®ÏƒÎµÏ‰Î½"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Ï‰Î½ ÏƒÎ·Î¼Î±Î½Ï„Î¹ÎºÏŽÎ½ Î±Î»Î»Î±Î³ÏŽÎ½ ÏƒÎµ ÎºÎ¬Î¸Îµ ÎÎºÎ´Î¿ÏƒÎ· Ï„Î¿Ï… Ï€ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±Ï„Î¿Ï‚"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "Î†Î´ÎµÎ¹Î± ^Ï‡ÏÎ®ÏƒÎ·Ï‚"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Ï‰Î½ ÏŒÏÏ‰Î½ Ï‡ÏÎ®ÏƒÎ·Ï‚ ÎºÎ±Î¹ Î´Î¹Î±Î½Î¿Î¼Î®Ï‚ Ï„Î¿Ï… Ï„Î¿Ï… Ï€ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±Ï„Î¿Ï‚"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ·"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "ÎŸÎ¸ÏŒÎ½ÎµÏ‚"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Î’Î¿Î®Î¸ÎµÎ¹Î±"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr "%s: ÎœÎµÎ½Î¿Ï %s: Î’Î¿Î®Î¸ÎµÎ¹Î± %s: ÎˆÎ¾Î¿Î´Î¿Ï‚ %s: Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· %s: Î•ÏÎ³Î±ÏƒÎ¯ÎµÏ‚ Î Î±ÎºÎÏ„Ï‰Î½"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "Î"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ÎŸ"
 
@@ -4438,13 +4554,54 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Î©Ï‡!  ÎˆÎ»Î±Î²Î± Ï„Î¿ ÏƒÎ®Î¼Î± SIGQUIT, ÎÏ†Ï…Î³Î±..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "ÎÎ±Î¹"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "ÎŸÏ‡Î¹"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Î•Î½Ï„Î¿Î»ÎÏ‚:\n"
+#~ "  y: ÏƒÏ…Î½ÎÏ‡ÎµÎ¹Î± Ï„Î·Ï‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚\n"
+#~ "  n: Î±ÎºÏÏÏ‰ÏƒÎ· ÎºÎ±Î¹ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·\n"
+#~ "  i: ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¹ÏŽÎ½ Î³Î¹Î± ÎÎ½Î± Î® Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± Ï€Î±ÎºÎÏ„Î±\n"
+#~ "     Ï„Î± Î¿Î½ÏŒÎ¼Î±Ï„Î± Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Ï„Î¿ 'i'.\n"
+#~ "  d: Î±Ï€/ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ ÎµÎ¾Î±ÏÏ„Î®ÏƒÎµÏ‰Î½\n"
+#~ "  s: Î±Ï€/ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ Î±Î»Î»Î±Î³ÏŽÎ½ ÏƒÏ„Î± Î¼ÎµÎ³ÎÎ¸Î· Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½\n"
+#~ "  v: Î±Ï€/ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ ÎµÎºÎ´ÏŒÏƒÎµÏ‰Î½\n"
+#~ "  e: Î±Î»Î»Î±Î³Î® ÏƒÎµ Î¿Ï€Ï„Î¹ÎºÎ® Î´Î¹Î±ÏƒÏÎ½Î´ÎµÏƒÎ·\n"
+#~ "\n"
+#~ "  ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î±ÎºÏŒÎ¼Î± Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ Î¼ÎµÏ„Î±Ï„ÏÎ¿Ï€ÎÏ‚ ÏƒÏ„Î¿ ÏƒÏÎ½Î¿Î»Î¿ Ï„Ï‰Î½ ÎµÎ½ÎµÏÎ³ÎµÎ¹ÏŽÎ½.\n"
+#~ "  Î Î»Î·ÎºÏ„ÏÎ¿Î»Î¿Î³Î®ÏƒÏ„Îµ ÎÎ½Î±Î½ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎ± ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚, Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ¼ÎµÎ½Î¿ Î±Ï€ÏŒ ÎÎ½Î± Î® "
+#~ "Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±\n"
+#~ "Î¿Î½ÏŒÎ¼Î±Ï„Î± Ï€Î±ÎºÎÏ„Ï‰Î½.  Î— ÎµÎ½ÎÏÎ³ÎµÎ¹Î± Î¸Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯ ÏƒÎµ ÏŒÎ»Î± Ï„Î± Ï€Î±ÎºÎÏ„Î±. (Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ\n"
+#~ "Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ ÎºÎ±Î¹ ÎµÏ€Î¹Ï€Î»ÎÎ¿Î½ ÎµÎ½ÎÏÎ³ÎµÎ¹ÎµÏ‚, ÎºÎ¬Î¸Îµ Î¼Î¹Î± Î¸Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯ ÏƒÎµ ÏŒÎ»Î± Ï„Î±\n"
+#~ "Ï€Î±ÎºÎÏ„Î± Ï€Î¿Ï… Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½)\n"
+#~ "\n"
+#~ "Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚:\n"
+#~ "  + : Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·\n"
+#~ "  - : Î‘Ï†Î±Î¯ÏÎµÏƒÎ·\n"
+#~ "  _ : Î”Î¹Î±Î³ÏÎ±Ï†Î®\n"
+#~ "  = : ÎšÏÎ¬Ï„Î·Î¼Î±\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.4\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-07-21 16:23+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"
@@ -156,7 +156,7 @@
 "Eliminar paquetes no utilizados que cumplan este filtro de forma automÃ¡tica"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Aceptar"
@@ -299,51 +299,51 @@
 "Nota: seleccionando \"%s\" en vez de\n"
 "      el paquete virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s ya estÃ¡ instalado en la versiÃ³n solicitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s no estÃ¡ instalado actualmente, luego no se reinstala.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "El paquete %s no estÃ¡ instalado, luego no se elimina\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "El paquete %s no estÃ¡ instalado, no se puede prohibir una actualizaciÃ³n\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "El paquete %s no es actualizable, no se puede prohibir una actualizaciÃ³n\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Nota: seleccionando la tarea \"%s: %s\" para la instalaciÃ³n\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 "SÃ³lo puede especificar una versiÃ³n de un paquete con una orden 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "SÃ³lo puede especificar un archivo de un paquete con la orden 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -352,7 +352,7 @@
 "No se puede encontrar el paquete \"%s\", y su nombre\n"
 "\"%s\" se encuentra en mÃ¡s de 40 paquetes.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -361,14 +361,14 @@
 "No se puede encontrar el paquete \"%s\". Sin embargo, los siguientes\n"
 "paquetes contienen \"%s\" en su nombre:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "No se puede encontrar ningÃºn paquete cuyo nombre o descripciÃ³n coincida con "
 "\"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -377,7 +377,7 @@
 "No se puede encontrar ningÃºn paquete que coincida con \"%s\", y mÃ¡s de 40\n"
 "paquetes contienen \"%s\" en su descripciÃ³n.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -386,6 +386,11 @@
 "No se puede encontrar ningÃºn paquete que coincida con \"%s\". Sin embargo,\n"
 "los siguiente paquetes contienen \"%s\" en su descripciÃ³n:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "CarÃ¡cter de acciÃ³n '%c' incorrecto\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -429,7 +434,7 @@
 msgid "Invalid operation %s"
 msgstr "OperaciÃ³n %s invÃ¡lida"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -440,16 +445,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "descarga: debe especificar al menos un paquete para descargar\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "No se pudo leer la lista de fuentes"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "No se puede encontrar ningÃºn paquete con el nombre \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -509,95 +514,95 @@
 "Â¿QuÃ© es? Es un elefante que estÃ¡ siendo devorado por una serpiente, por "
 "supuesto.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "No se pudo leer la lista de fuentes"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "pero se va a instalar %s."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "pero %s estÃ¡ instalado y retenido."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "pero estÃ¡ instalado %s."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "pero no es instalable"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " que es un paquete virtual."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " o"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Los siguientes paquetes estÃ¡n ROTOS:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Los siguientes paquetes no se usan y se ELIMINARÃN:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Los siguientes paquetes han sido retenidos automÃ¡ticamente:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Se instalarÃ¡n automÃ¡ticamente los siguientes paquetes NUEVOS:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Se ELIMINARÃN automÃ¡ticamente los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Se DESACTUALIZARÃN los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Se han retenido los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Se REINSTALARÃN los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Se instalarÃ¡n los siguiente paquetes NUEVOS:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Se ELIMINARÃN los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Se actualizarÃ¡n los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Â¡Se ELIMINARÃN los siguientes paquetes ESENCIALES!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Esta acciÃ³n ROMPERÃ los siguientes paquetes ESENCIALES:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -606,87 +611,118 @@
 "AVISO: Â¡Esta acciÃ³n probablemente romperÃ¡ su sistema!<\n"
 "       Â¡NO continÃºe a menos que sepa EXACTAMENTE lo que hace!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "SÃ, sÃ© que es una idea muy mala"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Para continuar, teclee la frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "SÃ"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "No"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Para continuar, teclee la frase \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Se RECOMIENDAN los siguientes paquetes, pero NO se instalarÃ¡n:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Se SUGIEREN los siguientes paquetes, pero NO se instalarÃ¡n:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "No se instalarÃ¡, actualizarÃ¡ o eliminarÃ¡ ningÃºn paquete.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquetes actualizados, %lu nuevos instalados, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para eliminar y %lu sin actualizar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Necesito descargar %sB/%sB de ficheros. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Necesito descargar %sB de ficheros. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "DespuÃ©s de desempaquetar se usarÃ¡n %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "DespuÃ©s de desempaquetar se liberarÃ¡n %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "CarÃ¡cter de acciÃ³n '%c' incorrecto\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "NingÃºn paquete a mostrar -- introduzca los nombres de los paquetes en la "
 "lÃnea despuÃ©s de 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Presione Enter para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
@@ -694,16 +730,112 @@
 "lÃnea\n"
 "despuÃ©s de 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Presione Enter para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "El formato de muestra para las vistas de paquetes"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "Paquetes no instalados"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Se instalarÃ¡n automÃ¡ticamente los siguientes paquetes NUEVOS:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Instalar/eliminar paquetes"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Olvidar paquetes nuevos"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - bloquea paquetes\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - marca paquetes como instalados manualmente\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - desmarca paquetes como instalados manualmente\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "recomienda"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Â¿Quiere continuar? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -714,7 +846,7 @@
 "Se mostrarÃ¡ la informaciÃ³n de dependencias.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -725,7 +857,7 @@
 "No se mostrarÃ¡ la informaciÃ³n de dependencias.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -736,7 +868,7 @@
 "Se mostrarÃ¡n las versiones.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -747,7 +879,7 @@
 "No se mostrarÃ¡n la versiones.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -758,7 +890,7 @@
 "Se mostrarÃ¡n los tamaÃ±os de los cambios.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -769,135 +901,108 @@
 "No Se mostrarÃ¡n los tamaÃ±os de los cambios.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Ã“rdenes:\n"
-"  y: continÃºa con la instalaciÃ³n\n"
-"n: cancela y termina\n"
-"  i: muestra informaciÃ³n acerca de uno o mÃ¡s paquetes,\n"
-"     los nombres de los paquetes deben seguir la 'i'.\n"
-"  c: muestra el registro de cambios de Debian de uno o mÃ¡s paquetes,\n"
-"     los nombres de los paquetes deben seguir la 'c'.        \n"
-"  d: cambia a la vista con la informaciÃ³n de dependencias\n"
-"  s: cambia a la vista con los cambios en el tamaÃ±o de los paquetes\n"
-"  v: cambia a la vista con las versiones\n"
-"  e: entra en la interfaz visual completa\n"
-"\n"
-"  TambiÃ©n puede especificar modificaciones al conjunto de acciones sobre "
-"los\n"
-"paquetes. Para hacerlo, escriba un carÃ¡cter de acciÃ³n seguido por uno o mÃ¡s\n"
-"paquetes o patrones. La acciÃ³n se aplicarÃ¡ a todos los paquetes. (Puede\n"
-"especificar acciones adicionales, cada una de ellas se aplicarÃ¡ a todos los\n"
-"paquetes que las sigan)\n"
-"\n"
-"Acciones:\n"
-"  + : Instala\n"
-"  - : Elimina\n"
-"  _ : Purga\n"
-"  = : Retiene\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Respuesta invÃ¡lida. Por favor, introduzca una orden vÃ¡lida o '?' para leer "
 "la ayuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Salir del programa"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "No se satisfacen las dependencias de los siguientes paquetes:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Los siguientes paquetes estÃ¡n ROTOS:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Error al escribir el fichero de estado"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Respuesta invÃ¡lida. Por favor, introduzca una orden vÃ¡lida o '?' para leer "
 "la ayuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Respuesta invÃ¡lida. Por favor, introduzca una orden vÃ¡lida o '?' para leer "
 "la ayuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1194,7 +1299,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Borrando los ficheros descargados ya obsoletos"
 
@@ -1488,26 +1593,21 @@
 "No ha sido posible corregir las dependencias, no se pueden instalar algunos "
 "de los paquetes"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "No se pudo leer la lista de fuentes."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "No se pudo abrir o interpretar las listas de paquetes o el fichero de estado."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Puede que quiera actualizar las listas de paquetes para corregir los "
 "ficheros que faltan"
 
-#: 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/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1790,17 +1890,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo de norma de ordenaciÃ³n invÃ¡lida: '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilado en %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1809,7 +1909,7 @@
 "\n"
 "VersiÃ³n de ncurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1818,22 +1918,22 @@
 "\n"
 "VersiÃ³n de curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "VersiÃ³n de libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Modo de uso: aptitude [-S nombre_fichero] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opciones] <acciÃ³n> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1843,43 +1943,43 @@
 "interactivo):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      -  instala/actualiza paquetes\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       -  elimina paquetes\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 " purge        - elimina paquetes junto con sus ficheros de configuraciÃ³n\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - bloquea paquetes\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - desbloquea un paquete\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - marca paquetes como instalados manualmente\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - desmarca paquetes como instalados manualmente\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1888,17 +1988,17 @@
 " forbid-version - prohÃbe a aptitude actualizar a una versiÃ³n especÃfica de "
 "un paquete.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - descarga las listas de paquetes nuevos/actualizables\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - realiza una actualizaciÃ³n segura\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1907,71 +2007,71 @@
 " dist-upgrade - realiza una actualizaciÃ³n, posiblemente instalando y "
 "eliminando paquetes\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - olvida quÃ© paquetes son \"nuevos\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - busca un paquete por nombre y/o expresiÃ³n\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - muestra informaciÃ³n detallada de un paquete\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - elimina los ficheros de paquetes descargados\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 " autoclean    - elimina los ficheros de paquetes descargados obsoletos\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - muestra el registro de cambios del paquete\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - descarga los ficheros .deb para un paquete\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opciones:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr "-h              Este texto de ayuda\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 "-s              Simula las acciones, pero en realidad no las realiza.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 "-d              SÃ³lo descarga paquetes, no instala o desinstala nada.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr "-p              Siempre pide confirmaciÃ³n de las acciones\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1979,7 +2079,7 @@
 "-y              Supone que la respuesta a preguntas simples del tipo sÃ/no "
 "es Â«sÃÂ»\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1988,7 +2088,7 @@
 "-F formato      Especifica el formato para mostrar los resultados de las "
 "bÃºsquedas, lea el manual\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1996,7 +2096,7 @@
 "-O orden        Especifica como se deben ordenar los resultados de la "
 "bÃºsqueda, lea el manual\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -2004,17 +2104,17 @@
 "-w ancho        Especifica el ancho del visor para dar formato a los "
 "resultado de la bÃºsqueda\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr "-f              Trata de arreglar paquetes rotos de forma agresiva.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr "-V              Muestra la versiÃ³n de los paquetes a instalar.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -2022,19 +2122,19 @@
 "-D              Muestra las dependencias de los paquetes cambiados "
 "automÃ¡ticamente.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr "-Z\t\t    Muestra el cambio del tamaÃ±o instalado de cada paquete.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 "-v              Muestra informaciÃ³n extra (puede darse mÃ¡s de una vez)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -2042,14 +2142,14 @@
 "-t [distrib]    Establece la distribuciÃ³n desde la que se instalan los "
 "paquetes\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o opconf=val     Establecer directamente la opciÃ³n de configuraciÃ³n "
 "llamada 'opconf'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2058,65 +2158,65 @@
 " --with(out)-recommends,\tEspecifica si se tratan o no las                "
 "recomendaciones como dependencias fuertes\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 "-S fnombre: lee la informaciÃ³n de estado extendida de aptitude de fnombre.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr "-u       : Descarga una nueva lista de paquetes al arrancar.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr "-i       : Realiza una instalaciÃ³n al arrancar.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Este aptitude no tiene poderes de Super Vaca.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o requiere un argumento de la forma opciÃ³n=valor, se dio %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "RAREZA: recibido cÃ³digo de opciÃ³n desconocido\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "No se puede especificar -u y -i a la vez\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u e -i puede que no deban especificarse en la lÃnea de Ã³rdenes (p.ej., con "
 "'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u e -i puede que no deban especificarse con una orden"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Orden desconocida \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2147,7 +2247,7 @@
 msgid "Lost"
 msgstr "PerdiÃ³"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Buscaminas"
 
@@ -2327,7 +2427,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paquete"
 
@@ -3823,54 +3923,54 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Vaya, no hay errores, esto no deberÃa haber ocurrido.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Buscar por:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Â¡Ya es el administrador!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "El subproceso saliÃ³ con error, Â¿escribiÃ³ su contraseÃ±a correctamente?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Cargando cachÃ©"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Â¿Salir de Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Â¿De verdad quiere descartar sus preferencias personales y cargar los valores "
 "por omisiÃ³n?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Paquetes"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Ver los paquetes disponibles y escoger las acciones a realizar"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3887,15 +3987,15 @@
 "en el menÃº de Ayuda. Esto es software libre, puede redistribuirlo \n"
 "bajo ciertas condiciones, para mÃ¡s informaciÃ³n consulte la 'Licencia'."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "LÃ‰AME"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3903,45 +4003,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continua"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Pre-visualizaciÃ³n de la instalaciÃ³n de los paquetes"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Prev"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Algunos paquetes estaban rotos y se han arreglado."
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3951,26 +4051,26 @@
 "administraciÃ³n, que actualmente no tiene. Â¿DesearÃa cambiar a la \n"
 "cuenta de administrador?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Convertirse en administrador"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "No convertirse en administrador"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3982,7 +4082,7 @@
 "Algunos paquetes pueden actualizarse, pero ha elegido no actualizarlos.\n"
 "Escriba \"U\" para preparar una actualizaciÃ³n."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3993,101 +4093,114 @@
 "administraciÃ³n, que actualmente no tiene. Â¿DesearÃa cambiar a la cuenta\n"
 "de administrador?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Eliminando ficheros descargados"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Se han borrado los ficheros de paquetes descargados"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Se han borrado los ficheros de paquetes descargados y obsoletos"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Pierda su tiempo intentando buscar las minas"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "No se pudo abrir %s para escribir en Ã©l"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Instalar/eliminar paquetes"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Realizar todas las instalaciones y eliminaciones pendientes"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Actualizar la lista de paquetes"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Buscar nuevas versiones de los paquetes"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Olvidar paquetes nuevos"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Olvidar que paquetes son Â«nuevosÂ»"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^Limpiar la cachÃ© de paquetes"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Borra los ficheros de paquetes descargados previamente"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Limpiar ficheros ^obsoletos"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Marcar ^actualizable"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Jugar al buscaminas"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Convertirse en administrador"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4096,70 +4209,70 @@
 "Ejecuta 'su' para convertirse en administrador. Esto reiniciarÃ¡ el programa\n"
 "pero se mantendrÃ¡n sus preferencias."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Recargar la cachÃ© de paquetes"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Recarga la cachÃ© de paquetes"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Salir"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Deshacer"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marcar el paquete seleccionado actualmente para instalar o actualizar"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Eliminar"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar el paquete seleccionado actualmente para eliminar"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Mantener"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar cualquier acciÃ³n en el paquete seleccionado"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Retener"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4167,11 +4280,11 @@
 "Cancelar cualquier acciÃ³n en el paquete seleccionado, y protejerlo de "
 "futuras actualizaciones"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Marcar ^automÃ¡tico"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4180,11 +4293,11 @@
 "Marcar el paquete seleccionado como instalado automÃ¡ticamente.\n"
 "Se eliminarÃ¡ automÃ¡ticamente si ningÃºn otro paquete depende de Ã©l"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Marcar ^manual"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4193,11 +4306,11 @@
 "Marcar el paquete seleccionado como instalado manualmente.\n"
 "No se eliminarÃ¡ a menos que lo haga manualmente"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^ProhÃbir versiones"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4206,218 +4319,218 @@
 "Evitar que se instale la versiÃ³n candidata del paquete seleccionado.\n"
 "Las versiones posteriores del paquete se instalaran de la forma usual"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "^InformaciÃ³n"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Mostrar mÃ¡s informaciÃ³n acerca del paquete seleccionado"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Registro de cambios"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar el registro de cambios del paquete seleccionado"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Buscar"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Buscar un paquete"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Buscar otra ^Vez"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Repetir la Ãºltima bÃºsqueda"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Limitar vista"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Aplicar un filtro a la lista de paquetes"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^No limitar vista"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Eliminar el filtro de la lista de paquetes"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Buscar ^Roto"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontrar el siguiente paquete con dependencias insatisfechas"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "Opciones de la ^IU"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Cambiar las preferencias que afectan a la interfaz de usuario"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "Manejo de ^dependencias"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^MiscelÃ¡nea"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Cambiar diversas preferencias del programa"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Deshacer opciones"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Fijar todas las preferencias en los valores predeterminados"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Siguiente"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Ver siguiente pantalla"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Prev"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Ver pantalla anterior"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Cierra"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Cerrar esta pantalla"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Nueva ^vista de paquetes"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Crear una nueva vista de paquetes por defecto"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Nuevo ^navegador de categorÃas"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Navegar paquetes por categorÃas"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Acerca de"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Ver informaciÃ³n sobre este programa"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Ayuda"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Ver la ayuda en lÃnea"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Manual de usuario"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Consultar el manual detallado del programa"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^PUF"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Ver una lista de preguntas frecuentes"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr ""
 "Leer los cambios mÃ¡s importantes realizados en cada versiÃ³n del programa"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Buscar"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Opciones"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: MenÃº %s: Ayuda %s: Salir %s: Actualizar %s: Descarga/Instala/Elimina Paqs"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "sÃ"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no"
 
@@ -4459,13 +4572,58 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Â¡Argh!  Recibido SIGQUIT, terminando..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "SÃ"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "No"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Ã“rdenes:\n"
+#~ "  y: continÃºa con la instalaciÃ³n\n"
+#~ "n: cancela y termina\n"
+#~ "  i: muestra informaciÃ³n acerca de uno o mÃ¡s paquetes,\n"
+#~ "     los nombres de los paquetes deben seguir la 'i'.\n"
+#~ "  c: muestra el registro de cambios de Debian de uno o mÃ¡s paquetes,\n"
+#~ "     los nombres de los paquetes deben seguir la 'c'.        \n"
+#~ "  d: cambia a la vista con la informaciÃ³n de dependencias\n"
+#~ "  s: cambia a la vista con los cambios en el tamaÃ±o de los paquetes\n"
+#~ "  v: cambia a la vista con las versiones\n"
+#~ "  e: entra en la interfaz visual completa\n"
+#~ "\n"
+#~ "  TambiÃ©n puede especificar modificaciones al conjunto de acciones sobre "
+#~ "los\n"
+#~ "paquetes. Para hacerlo, escriba un carÃ¡cter de acciÃ³n seguido por uno o "
+#~ "mÃ¡s\n"
+#~ "paquetes o patrones. La acciÃ³n se aplicarÃ¡ a todos los paquetes. (Puede\n"
+#~ "especificar acciones adicionales, cada una de ellas se aplicarÃ¡ a todos "
+#~ "los\n"
+#~ "paquetes que las sigan)\n"
+#~ "\n"
+#~ "Acciones:\n"
+#~ "  + : Instala\n"
+#~ "  - : Elimina\n"
+#~ "  _ : Purga\n"
+#~ "  = : Retiene\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"
@@ -4565,9 +4723,6 @@
 #~ msgid "Upgradable Packages"
 #~ msgstr "Paquetes susceptibles de actualizaciÃ³n"
 
-#~ msgid "Not Installed Packages"
-#~ msgstr "Paquetes no instalados"
-
 #~ msgid "Virtual Packages"
 #~ msgstr "Paquetes virtuales"
 

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-10-09 19:03+0200\n"
 "Last-Translator: Piarres Beobide EgaÃ±a <pi at beobide.net>\n"
 "Language-Team: Euskara <librezale at librezale.org>\n"
@@ -157,7 +157,7 @@
 msgstr "Ezabatu erabiligabeko paketeak automatikoki iruzkin hau erabiliaz"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ados"
@@ -301,47 +301,47 @@
 "Oharra: \"%s\" aukeratzen \"%s\"\n"
 "       pakete birtualaren ordez.\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s dagoneko eskatutako bertsioan (%s) instalaturik dago\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s ez dago instalaturik beraz ez da berrinstalatu behar.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "%s paketea ez dago instalaturik beraz, ezin da ezabatu.\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "%s paketea ez dago instalaturik, ezin da eguneratu\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "%s paketea ez da eguneragarria, ezin da eguneratu\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Oharra: \"%s: %s\" ataza instalatzeko aukeratzen\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "'install' komandoaz pakete bertsio bakar bat instalatu daiteke.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Install komandoaz zuk pakete fitxategi bat bakarriz ezarri dezakezu.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -350,7 +350,7 @@
 "Ezin da \"%s\" paketa aurkitu, eta 40 paketetik\n"
 "gora dute \"%s\" beren izenean.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -359,13 +359,13 @@
 "Ezin da \"%s\" paketa aurkitu, eta hurrengo paketeak\n"
 "\"%s\" beren izenean dute:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Bilatutako \"%s\" pareko izene edo azalpeneko paketerik ez da aurkitu.\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -374,7 +374,7 @@
 "Ez da aurkitu \"%s\" duen paketerik eta 40 paketea baino gehiagoren\n"
 "azalpenean \"%s\" agertzen da.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -383,6 +383,11 @@
 "Ez da aurkitu \"%s\" duen paketerik eta hurrengo paketeen\n"
 "azalpenean \"%s\" agertzen da:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "'%c' karaktere ekintza okerra\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Ezin da paginatzaile-sensiblea erabili, hau Debian sistema bat al da?"
@@ -423,7 +428,7 @@
 msgid "Invalid operation %s"
 msgstr "Operazio baliogabea %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -434,16 +439,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "deskargak: zuk pakete bat beintzat ezarri behar duzu deskargatzeko\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Ezin da jatorri zerrenda irakurri"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Ez da \"%s\" izeneko paketerik aurkitu."
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -503,95 +508,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Zer da hau? Hau elefante bat jaten ari den suge bat da, noski.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Ezin da jatorri zerrenda irakurri"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "baina %s ez dago instalaturik"
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "baina %s instalaturik eta hizozturik dago."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "baina %s instalaturik dago"
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "baina ez da instalagarri"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr "pakete  birtual bat dena"
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr "edo"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Hurrengo paketeak APURTURIK daude:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Hurrengo apaketeak ez dira erabiltzen eta EZABATU egingo dira:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Hurrengo paketeak automatikoki eguneratu gabe utziko dira:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Hurrengo pakete berri hauek automatikoki instalatu egingo dira:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Hurrengo pakete berri hauek automatikoki EZABATU egingo dira:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Hurrengo paketak ATZERATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Honako paketea hauek ez dira eguneratuko:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Hurrengo paketak BERRINSTALATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Hurrengo paketak berriak INSTALATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Hurrengo paketak EZABATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Hurrengo paketak EGUNERATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Hurrego BEHARREZKO paketeak EZABATU egingo dira!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Ekintza honek hurrego BEHARREZKO paketeak APURTU ditzake!\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -600,100 +605,228 @@
 "KONTU: Ekintza hau egitak ziurreink zure sistema apurtuko du! \n"
 "         EZ JARRAITU ez badakizu ZEHATZ MEHATZ zer egiten ari zaren!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Hau oso ideia txarra ela ziur nago"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Jarraitzeko idatzi \"%s\" esaldia:\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Bai"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Ez"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Jarraitzeko idatzi \"%s\" esaldia:\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Hurrengo paketeak GOMENDATURIK daude baina EZ dira instalatuko:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Hurrengo paketeak GOMENDATURIK daude baina EZ dira instalatuko:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ez dira paketerik instalatu eguneratu edo ezabatuko.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakete eguneratorik, %lu berri instalaturik"
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu berrinstalaturik, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu atzeraturik, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu ezabatu eta %lu ez dira eguneratu.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "%sB/%sB Fitxategi eskuratu behar dira. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "%sB Fitxategi eskuratu behar dira. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Desenpaketatu ondoren %sB erabiliko dira\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Desenpaketatu ondoren %sB uztuko dira\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "'%c' karaktere ekintza okerra\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ez dagop paketerik erkusteko -- sar pakete izenak 'i'-ren ondoren.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Zanpatu return jarraitzeko."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Ez da paketerik aurkitu -- sar pakete izenak lerroan 'c'-ren ondoren.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Zanpatu return jarraitzeko."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Pakete ikuspegirako bistaratze formatua"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Paketeak Instalatu/Ezabatu"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Hurrengo pakete berri hauek automatikoki instalatu egingo dira:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Paketeak Instalatu/Ezabatu"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "(^F) Ahaztu pakete berriak"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Paketeak hizoztu\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+" markauto     - Markatu automatikoki instlatuak izan diren fitxategiak\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - Markatu eskus instalaturik izan diren paketeak\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "gomendaturik"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Jarraitzea nahi al duzu? [Y/n/?]"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -704,7 +837,7 @@
 "Dependentzi argibideak erakutsiko dira.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -715,7 +848,7 @@
 "Dependentzi argibideak ez da erakutsiko.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -726,7 +859,7 @@
 "Bertsioak erakutsiko dira.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -737,7 +870,7 @@
 "Bertsioak ez dira erakutsiko.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -748,7 +881,7 @@
 "Tamaina aldaketeak erakutsiko dira.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -759,135 +892,108 @@
 "Tamaina aldaketeak ez dira erakutsiko.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Komandoak:\n"
-"  y: instalazioarekin jarraitu\n"
-"  n: instalazioa eten eta irten\n"
-"  i: ikusi pakete bat edo gehiagoren argibideak\n"
-"     pakete izenak 'i' ondoren ipini\n"
-"  c: ikusi pakete bat edo gehiagoren aldaketa erregistroa\n"
-"     pakete izenak 'i' ondoren ipini\n"
-"  d: Dependentzi argibide bistaratzea aldatu\n"
-"  s: Pakete tamaina bistaratzea aldatu\n"
-"  v:  Bertsio bistaratzea aldatu\n"
-"  e: sar interfaze grafiko osoan\n"
-"\n"
-"  Zuk paketeen gain egiteko ekintza taldearen aldaketak ezarri ditzazkezu.\n"
-"  Hau egiteko, sar ekintza karaktere bat pakete edo patroi bat edo "
-"gehiagoz \n"
-"jarraitua. Ekintza pakete guztietan egingo da. (ekintza gehigarriak ere "
-"ezarri\n"
-"ditzazkezu eta hauek pakete guztietan egingo dira)\n"
-"\n"
-"Ekintzak:\n"
-"  + : Instalatu\n"
-"  - : Ezabatu\n"
-"  _ : Garbitu\n"
-"  = : Hizoztu\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Erantzun baliogabea. Mesedez sar ezazu baliozko komando bat edo '?' "
 "laguntzarako.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Programatik irten"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Honako paketeek betegabeko dependentziak dituzte:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Hurrengo paketeak APURTURIK daude:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Ezzinb da %s idazteko ireki"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Errorea egoera fitxategia idazterakoan"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Erantzun baliogabea. Mesedez sar ezazu baliozko komando bat edo '?' "
 "laguntzarako.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Erantzun baliogabea. Mesedez sar ezazu baliozko komando bat edo '?' "
 "laguntzarako.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "bilatu: Zuk beintzat bilaketa patroi bat eman behar duzu\n"
@@ -1183,7 +1289,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Ezin izan dira zerrendako karpetak ezabatu"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Deskargatutako fitxategi zaharkituak ezabatzen"
 
@@ -1472,25 +1578,20 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Ezin dira dependentziak konpondu, zenbait pakete ezin dira instalatu"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Ezin da jatorri zerrenda irakurri."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakete zerrenda edo egoera fitxategia ezin dira ireki edo analizatu."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Zuk agian falta diren fitxategi hauek konpontzek pakete zerrenda eguneratu "
 "nahi duzu"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Ezzinb da %s idazteko ireki"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1768,17 +1869,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Baliogabea biltze politika mota:'%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s, %s %s-en konpilaturik\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilatzailea: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1787,7 +1888,7 @@
 "\n"
 "NCurses bertsioa: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1796,22 +1897,22 @@
 "\n"
 "Curses bertsioa: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ bertsioa: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Erabilera: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [aukerak] <ekintza> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1821,43 +1922,43 @@
 "da);\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Paketeak instalatu/eguneratu\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Paketeak ezabatu\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Paketeak eta haien konfigurazio fitxategiak ezabatu\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Paketeak hizoztu\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Ezeztatu pakete baten hizoztu komandoa\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 " markauto     - Markatu automatikoki instlatuak izan diren fitxategiak\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Markatu eskus instalaturik izan diren paketeak\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1866,17 +1967,17 @@
 " forbid-version - aptitude pakete baten bertsio jakin batera eguneratzea "
 "galerazten du.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Pakete berri/eguneragarrien zerrenda deskargatu\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Eguneraketa ziur bat egin\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1885,58 +1986,58 @@
 " dist-upgrade - Eguneraketa bat egin, ziurrenik paketak instalatu eta "
 "ezabatuaz\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Ahaztu zein pakete den \"berria\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Bilatu pakete bat izen edo/eta espresio batez.\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Bistaratu pakete baten azalpen zehatzak\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Ezabatu deskargaturiko pakete fitxategiak\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Ezabatu aurrerago deskargaturiko pakete fitxategiak\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Pakete baten aldaketa erregistro bistaratu\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Deskargatu pakete batentzat .deb fitxategia\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  (0)aukerak:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Laguntza testu hau\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Ekintzak egiteko itxura egin baina ez ekintzik egin orain.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1944,12 +2045,12 @@
 " -d             Paketeak deskargatu bakarrik, ez ezer ezabatu edo "
 "instalatu.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Beti galdetu berrespen edo ekintzetan\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1957,7 +2058,7 @@
 " -y             Bai edo ez moduko galdera simpleetan erantzuna baiezkoa "
 "(yes) dela ezarri\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1966,7 +2067,7 @@
 " -F format      Ezarri emaitzetan erabili nahi duzun formatua, manuala "
 "begiratu\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1974,39 +2075,39 @@
 " -O ordena       Ezarri bilaketa emaitzak nola sailkatzea nahi duzun, "
 "manuala begiratu\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 " -w width       Ezarri pantaila zabalera bilaketa emaitza formatuetarako\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 "-f              Apurturiko paketeak modu indartuan konpontzen saiatzen da.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Erakutsi paketeen zein bertsio instalatua izango den.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 "-D              Erakutsi automatikoki aldatutako paketeen dependentziak.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 " -Z\t\t    Erakutsi insstalatutako pakete bakoitzaren tamaina aldaketa.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -2014,19 +2115,19 @@
 " -v             Argibide xehetuak erakutsi.(bein baino gehiagotan erabil "
 "daiteke)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 "-t [banaketa]    Paketeak zein banaketatik instalatuko diren ezartzen du.\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o key=val     Zuzenean 'key' izeneko konfigurazio ukera ezarri\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2035,64 +2136,64 @@
 " --with(out)-recommends\tEzarri gomendioak(iradokizunak) dependetzia\n"
 "                indartsu bezala erabiltzea ala ez\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr "-S fizena: fizena-ren aptitude hedatutako egoera irakurri.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Abiaraztean pakete zerrenda berria deskargatu.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Abiaraztean instalazio bat egin.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Aptitude honek ez ditu Super Behi potererik.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o gako=balioa antzerako argumentu bat behar du, %s erabiltzen"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "arraroa: aukera ezezagun kodea jasorik\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "-u eta -i artean bat bakarrik ezarri dezakezu\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 " baliteke komando moduan -u eta -i ez erabili behar izatea (adib, 'install'-"
 "ekin)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u eta -i ezin dira komando batekin erabili"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Komando ezezaguna \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2123,7 +2224,7 @@
 msgid "Lost"
 msgstr "Galdu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Mina-aurkitzailea"
 
@@ -2299,7 +2400,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paketea"
 
@@ -3769,52 +3870,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Er, hemen ez dago errorerik,hau ezen gertatu beharko.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Bilatu honentzat:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Zu dagoeneko root zara!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Azpiprozesua errore batez amaitu da - pasahitz egokia erabili al duzu?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Katxea kargatzen"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Benetan Aptitude itxi?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Benetan zure ezarpen pertsonalÃ±ak ezabatu eta lehentsietara itzuli?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Paketeak"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Pakete eskuragarriak ikusi eta egibeharreko ekintzak aukeratu"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3830,15 +3931,15 @@
 "lizentzia ikusi ditzazkezu. Hau Software librea da eta zenbait egoeratan "
 "(lizentzia ikusi xehetasunetarako) banatzeko aukera duzu."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "IRAKURRI"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3846,45 +3947,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Jarraitu"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Pakete instalazioaren aurreikuspena"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Egingo diren ekintzak bistarazi eta/edo ezarri"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "(^P)Aurrekoa"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Zenbait pakiete apurturik zeuden eta konponduak izan dira"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3893,24 +3994,24 @@
 "Paketak instalu/ezabatzeak zuk une honetan ez dituzun kudeatzaiuile\n"
 "baimenak behar ditu. Root kontura aldatu nahi al duzu?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Root biurtu"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Ez root biurtu"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Pakete zerrenda eguneraketa edo instalaketa bat abiarazirik dago dagoeneko."
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ez dago paketerik instalatu, ezabatu edo eguneratzeko aukeraturik."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3922,7 +4023,7 @@
 "Zenbait pakete eguneratu daitezke baina zuk ez duzu eguneraketa aukeratu.\n"
 "\"U\" erabili danak eguneraketarako prestatzeko."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3932,99 +4033,112 @@
 "ditu.\n"
 "Root kontura aldatu nahi al duzu?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Minak aurkitzen saiatzen denbora pasa"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Deskarga bat abiarazirik dagoenean ez da garbitzerik onartzen"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "Deskargaturiko fitxategiak ezabatzen"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Deskargaturiko pakete fitxategiak ezabatuak izan dira"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Zaharkitutako deskargatutako paketeak ezabatuak izan dira"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Minak aurkitzen saiatzen denbora pasa"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Ezzinb da %s idazteko ireki"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Paketeak Instalatu/Ezabatu"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Egin falta diren instalaketa eta ezabaketak"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Eguneratu pakete Zerrenda"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Arakatu paketeen bertsio berrien bila"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "(^F) Ahaztu pakete berriak"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Ahaztu zein pakete diren \"berriak\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "(^C) Garbitu pakete katxea"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Ezabatu lehen deskargaturiko pakete fitxategiak"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Garbitu zaharkiturik^o fitxategiak"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Ezabatu dafoenekeo deskargatu ezin diren fitxategiak"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Eguneragarri Markat^u"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Markatu hizozturik ez dauden pakete eguneragarri guzitak eguneratzeko"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "(^P) Mina aurkitzailera jolastu"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "(^B) Root biurtu"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4033,68 +4147,68 @@
 "Root bihurtzeko 'su' abiarazi.  Honek programa berabiarazi du\n"
 "baina ezarpenak gordeko dira."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^(R) PAkete katxea berritu"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Pakete katxea Berritu."
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^(Q) Irten"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Programatik irten"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Desegin"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Desegin azke patekete ekintza edo ekintza taldea"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Instalatu"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Aukeratutako paketea instalatu edo eguneratzeko markatu"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Ezabatu"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Aukeratutako paketea ezabatzeko markatu"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Garbitu"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Aukeratutako paketea eta bere konfigurazioak ezabatzeko markatu"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Mantendu"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Aukeratutako paketean edozein ekintza ezeztatu"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Hizoztu"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4102,11 +4216,11 @@
 "Aukeratutako paketean edozein ekintza ezeztatu eta aurreragotako "
 "eguneraketez babestu"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "^Auto markatu"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4115,11 +4229,11 @@
 "Markatu aukeratutako paketea automatiko instalatu balitz bezala;\n"
 "beste paketerik behar ez duenean automatikoki ezabatua izango da"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Markatau ^Manuala"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4128,11 +4242,11 @@
 "Markatu aukeratutako paketea eskuz instalatua izan balitz bezala;\n"
 "berau ez da ezabatuko zuk eskuz ezabatu artean"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Debekatutako Bertsioa"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4141,215 +4255,215 @@
 "Debekatu aukeratutako paketearen aukerako bertsioa instalatzea;\n"
 "bertsio berragoak era arruntean kudeatuko dira"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformazioa"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Aukeratutako paketeren argibide gehiago bistaratu"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Aldaketa Erregistroa"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Bistarazi aukeratutako paketearen aldaketa erregistroa"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Bilatu"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Pakete bat bilatu"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Bilatu ^Berriz"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Azken bilaketa errepikatu"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Bistaratze Mugatu"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Pakete zerrendari iragazi bat ezarri"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Bistaratze Muga kendu"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Pakete zerrendari iragazia kendu"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "^Bilatu Apurtua"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Bilatu betegabeko dependentziak dituen hurrengo paketea"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^UI aukerak"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Erabiltzaile interfazeari dagozkion ezarpenak aldatu."
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Dependentzi kudeaketa"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Pakete dependentziak kudeatzeko eraren ezarpenak aldatu"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "(^M) Bestelakoak"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Programaren beste ezarpen batzuk aldatu"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "Auke^rak Atzeratu"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Berezarri ezarpen guztiak sistema lehenetsietara"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "Hurre^ngoa"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Ikusi hurrengo leihoa"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "(^P)Aurrekoa"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Ikusi aurreko leihoa"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "(^C)Itxi"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Itxi leiho hau"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "(^V) Paketea Berriak Ikusi"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Pakete bistaratze berri bat sortu"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Sailkapen ^Berria Ikusi"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Paketeak sailez bistarazi."
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "(^A)Honi buruz"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Programa honi buruzko argibideak ikusi"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "(^H)Laguntza"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Ikusi sare bidezko laguntza"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "Erabiltzailearen ^Manuala"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Ikusi programaren manual zehaztua"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Ikusi sarriago galdetutako galderen zerrenda?"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Begiratu programen bertsio bakoitzean eginiko aldaketa garrantzitsuak"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Lizentzia"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Begiratu zein egoeratan zuk programa kopiatu dezakezun"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Aukerak"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Ikuspegiak"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Laguntza"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s=Menua %s=Laguntza %s=Irten %s=Eguneratu %s=Deskargatu/Instalatu/Kendu"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "Bai_gakoa"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ez_gakoa"
 
@@ -4392,13 +4506,57 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ouch!  SIGQUIT jasorik ,hiltzen..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Bai"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Ez"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Komandoak:\n"
+#~ "  y: instalazioarekin jarraitu\n"
+#~ "  n: instalazioa eten eta irten\n"
+#~ "  i: ikusi pakete bat edo gehiagoren argibideak\n"
+#~ "     pakete izenak 'i' ondoren ipini\n"
+#~ "  c: ikusi pakete bat edo gehiagoren aldaketa erregistroa\n"
+#~ "     pakete izenak 'i' ondoren ipini\n"
+#~ "  d: Dependentzi argibide bistaratzea aldatu\n"
+#~ "  s: Pakete tamaina bistaratzea aldatu\n"
+#~ "  v:  Bertsio bistaratzea aldatu\n"
+#~ "  e: sar interfaze grafiko osoan\n"
+#~ "\n"
+#~ "  Zuk paketeen gain egiteko ekintza taldearen aldaketak ezarri "
+#~ "ditzazkezu.\n"
+#~ "  Hau egiteko, sar ekintza karaktere bat pakete edo patroi bat edo "
+#~ "gehiagoz \n"
+#~ "jarraitua. Ekintza pakete guztietan egingo da. (ekintza gehigarriak ere "
+#~ "ezarri\n"
+#~ "ditzazkezu eta hauek pakete guztietan egingo dira)\n"
+#~ "\n"
+#~ "Ekintzak:\n"
+#~ "  + : Instalatu\n"
+#~ "  - : Ezabatu\n"
+#~ "  _ : Garbitu\n"
+#~ "  = : Hizoztu\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 2005
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-10-11 09:21+0200\n"
 "Last-Translator: Jaakko Kangasharju <ashar at iki.fi>\n"
 "Language-Team: Jaakko Kangasharju <ashar at iki.fi>\n"
@@ -151,7 +151,7 @@
 msgstr "Poista automaattisesti tÃ¤hÃ¤n hakuehtoon tÃ¤smÃ¤Ã¤vÃ¤t paketit"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -294,48 +294,48 @@
 "Huom: valitsen paketin \"%s\" enkÃ¤\n"
 "      nÃ¤ennÃ¤ispakettia \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "Paketin %s pyydetty versio %s on jo asennettuna\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "Pakettia %s ei ole asennettu, joten sitÃ¤ ei asenneta uudelleen.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Pakettia %s ei ole asennettu, joten sitÃ¤ ei poisteta\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakettia %s ei ole asennettu, joten pÃ¤ivitystÃ¤ ei ole tarpeen estÃ¤Ã¤\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Paketti %s ei ole pÃ¤ivitettÃ¤vissÃ¤, joten pÃ¤ivitystÃ¤ ei ole tarpeen estÃ¤Ã¤\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Huom: valitsen tehtÃ¤vÃ¤n \"%s: %s\" asennettavaksi\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Vain 'install'-komennolle voi mÃ¤Ã¤rittÃ¤Ã¤ paketin version.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Vain 'install'-komennolle voi mÃ¤Ã¤rittÃ¤Ã¤ paketin arkiston.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -344,7 +344,7 @@
 "En lÃ¶ytÃ¤nyt pakettia \"%s\" ja yli 40 paketin\n"
 "nimessÃ¤ on merkkijono \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -353,13 +353,13 @@
 "En lÃ¶ytÃ¤nyt pakettia \"%s\".  NÃ¤iden pakettien\n"
 "nimet sisÃ¤ltÃ¤vÃ¤t merkkijonon \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "En lÃ¶ytÃ¤nyt pakettia, jonka nimi tai kuvaus sisÃ¤ltÃ¤isi merkkijonon \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -368,7 +368,7 @@
 "En lÃ¶ytÃ¤nyt pakettia, jonka nimi sisÃ¤ltÃ¤isi merkkijonon \"%s\"\n"
 "ja yli 40 paketin kuvaus sisÃ¤ltÃ¤Ã¤ merkkijonon \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -377,6 +377,11 @@
 "En lÃ¶ytÃ¤nyt pakettia, jonka nimi sisÃ¤ltÃ¤isi merkkijonon \"%s\".\n"
 "NÃ¤iden pakettien kuvaus sisÃ¤ltÃ¤Ã¤ merkkijonon \"%s\":\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Virheellinen komentomerkki '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -418,7 +423,7 @@
 msgid "Invalid operation %s"
 msgstr "Virheellinen toiminto %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -429,16 +434,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "nouto: ainakin yksi noudettava paketti on annettava\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "En pystynyt lukemaan pakettivarastolistaa"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "En lÃ¶ytÃ¤nyt pakettia \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -493,95 +498,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "MikÃ¤kÃ¶ se on?  SehÃ¤n on boa-kÃ¤Ã¤rme, joka sulattaa elefanttia.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "En pystynyt lukemaan pakettivarastolistaa"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "mutta %s on mÃ¤Ã¤rÃ¤tty asennettavaksi."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "mutta %s on asennettu ja odottaa."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "mutta %s on asennettu."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "mutta se ei ole asennettavissa"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr "joka on nÃ¤ennÃ¤ispaketti."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " tai"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "NÃ¤mÃ¤ paketit ovat RIKKI:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "NÃ¤mÃ¤ paketit ovat kÃ¤yttÃ¤mÃ¤ttÃ¶miÃ¤ ja POISTETAAN:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "NÃ¤mÃ¤ paketit on automaattisesti jÃ¤tetty odottamaan:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "NÃ¤mÃ¤ UUDET paketit asennetaan automaattisesti:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "NÃ¤mÃ¤ paketit POISTETAAN automaattisesti:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "NÃ¤mÃ¤ paketit VANHENNETAAN:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "NÃ¤mÃ¤ paketit on jÃ¤tetty odottamaan:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "NÃ¤mÃ¤ paketit ASENNETAAN UUDESTAAN:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "NÃ¤mÃ¤ UUDET paketit asennetaan:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "NÃ¤mÃ¤ paketit POISTETAAN:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "NÃ¤mÃ¤ paketit pÃ¤ivitetÃ¤Ã¤n:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "NÃ¤mÃ¤ VÃ„LTTÃ„MÃ„TTÃ–MÃ„T paketit POISTETAAN!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "TÃ¤mÃ¤ toiminto RIKKOO nÃ¤mÃ¤ VÃ„LTTÃ„MÃ„TTÃ–MÃ„T paketit:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -590,99 +595,226 @@
 "VAROITUS: TÃ¤mÃ¤ toiminto luultavasti hajoittaa jÃ¤rjestelmÃ¤si!\n"
 "          Ã„LÃ„ jatka, ellet tiedÃ¤ VARMASTI, mitÃ¤ teet!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "KyllÃ¤, tiedÃ¤n hyvin, ettÃ¤ tÃ¤mÃ¤ on aivan onnettoman surkea ajatus"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Kirjoita \"%s\" jatkaaksesi:\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "KyllÃ¤"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Ei"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Kirjoita \"%s\" jatkaaksesi:\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "NÃ¤itÃ¤ SUOSITELTUJA paketteja EI asenneta:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "NÃ¤itÃ¤ EHDOTETTUJA paketteja EI asenneta:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "MitÃ¤Ã¤n paketteja ei asenneta, pÃ¤ivitetÃ¤ tai poisteta.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pÃ¤ivitettyÃ¤ pakettia, %lu uutta asennusta, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu uudelleen asennettua, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu vanhennettua, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu poistettavaa ja %lu pÃ¤ivittÃ¤mÃ¤tÃ¶ntÃ¤.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Tarvitsee noutaa %sB/%sB arkistoista. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Tarvitsee noutaa %sB arkistoista. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Levytilaa kuluu %sB purkamisen jÃ¤lkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Levytilaa vapautuu %sB purkamisen jÃ¤lkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Virheellinen komentomerkki '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ei nÃ¤ytettÃ¤viÃ¤ paketteja -- anna pakettien nimet 'i':n jÃ¤lkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Paina Return jatkaaksesi."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Paketteja ei lÃ¶ytynyt -- anna pakettien nimet 'c':n jÃ¤lkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Paina Return jatkaaksesi."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "PakettinÃ¤kymien nÃ¤yttÃ¶tapa"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "Asentamattomat paketit"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "NÃ¤mÃ¤ UUDET paketit asennetaan automaattisesti:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Asenna/poista paketteja"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Unohda uudet paketit"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - JÃ¤Ã¤dytÃ¤ paketteja\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - Merkitse paketteja automaattisesti asennetuiksi\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - Merkitse paketteja kÃ¤sin asennetuiksi\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr ", suositus: "
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Haluatko jatkaa? [KyllÃ¤=y/ei=n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -693,7 +825,7 @@
 "Riippuvuustiedot nÃ¤ytetÃ¤Ã¤n.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -704,7 +836,7 @@
 "Riippuvuustietoja ei nÃ¤ytetÃ¤.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -715,7 +847,7 @@
 "Versiot nÃ¤ytetÃ¤Ã¤n.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -726,7 +858,7 @@
 "Versioita ei nÃ¤ytetÃ¤.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -737,7 +869,7 @@
 "Kokojen muutokset nÃ¤ytetÃ¤Ã¤n.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -748,131 +880,105 @@
 "Kokojen muutoksia ei nÃ¤ytetÃ¤.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Komennot:\n"
-"  y: jatka asennusta\n"
-"  n: keskeytÃ¤ ja lopeta\n"
-"  i: nÃ¤ytÃ¤ tiedot yhdestÃ¤ tai useammasta paketista;\n"
-"     pakettien nimet luetellaan 'i':n jÃ¤lkeen\n"
-"  c: nÃ¤ytÃ¤ Debianin muutoslokit yhdestÃ¤ tai useammasta paketista;\n"
-"     pakettien nimet luetellaan 'c':n jÃ¤lkeen\n"
-"  d: nÃ¤ytÃ¤/Ã¤lÃ¤ nÃ¤ytÃ¤ riippuvuustietoja\n"
-"  s: nÃ¤ytÃ¤/Ã¤lÃ¤ nÃ¤ytÃ¤ pakettien kokojen muutoksia\n"
-"  v: nÃ¤ytÃ¤/Ã¤lÃ¤ nÃ¤ytÃ¤ versioita\n"
-"  e: siirry kokoruutuliittymÃ¤Ã¤n\n"
-"\n"
-"  Voit myÃ¶s mÃ¤Ã¤rittÃ¤Ã¤ muutoksia paketeille tehtÃ¤viin toimenpiteisiin.\n"
-"  Tee tÃ¤mÃ¤ kirjoittamalla toimintomerkki ja sen jÃ¤lkeen yksi tai useampia\n"
-"pakettien nimiÃ¤ tai hakuehtoja.  Toiminto suoritetaan kaikille antamillesi\n"
-"paketeille.  Voit antaa useita toimintoja; kukin suoritetaan kaikille sitÃ¤\n"
-"seuraaville paketeille\n"
-"\n"
-"Toiminnot:\n"
-"  + : Asenna\n"
-"  - : Poista\n"
-"  _ : Siivoa\n"
-"  = : JÃ¤Ã¤dytÃ¤\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Virheellinen komento.  Anna hyvÃ¤ksytty komento tai '?' saadaksesi apua.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Poistu ohjelmasta"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "NÃ¤illÃ¤ paketeilla on tyydyttÃ¤mÃ¤ttÃ¶miÃ¤ riippuvuuksia:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "NÃ¤mÃ¤ paketit ovat RIKKI:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Virhe tilatietoja kirjoitettaessa"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Virheellinen komento.  Anna hyvÃ¤ksytty komento tai '?' saadaksesi apua.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Virheellinen komento.  Anna hyvÃ¤ksytty komento tai '?' saadaksesi apua.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: Ainakin yksi hakuehto tarvitaan\n"
@@ -1167,7 +1273,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "En pystynyt siivoamaan listahakemistoja"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Poistan vanhentuneita tiedostoja"
 
@@ -1450,24 +1556,19 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "En pysty korjaamaan riippuvuuksia; joitain paketteja ei voi asentaa"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Pakettivarastojen listaa ei pystynyt lukemaan."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakettilistan tai tilatiedoston avaaminen tai jÃ¤sennys epÃ¤onnistui."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Haluat ehkÃ¤ pÃ¤ivittÃ¤Ã¤ pakettilistat korjataksesi nÃ¤mÃ¤ puuttuvat tiedostot"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "En pysty kirjoittamaan tiedostoon %s"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1735,17 +1836,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "LajittelutyylillÃ¤ virheellinen tyyppi '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kÃ¤Ã¤nnÃ¶spÃ¤ivÃ¤ys %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "KÃ¤Ã¤ntÃ¤jÃ¤: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1754,7 +1855,7 @@
 "\n"
 "NCurses-versio: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1763,22 +1864,22 @@
 "\n"
 "Curses-versio: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++-versio: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "KÃ¤yttÃ¶: aptitude [-S tnimi] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [valitsimet] <toiminto> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1788,42 +1889,42 @@
 "tilaan):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Asenna tai pÃ¤ivitÃ¤ paketteja\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Poista paketteja\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Poista paketteja asetustiedostoineen\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - JÃ¤Ã¤dytÃ¤ paketteja\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Peruuta paketin jÃ¤Ã¤dytys\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - Merkitse paketteja automaattisesti asennetuiksi\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Merkitse paketteja kÃ¤sin asennetuiksi\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1832,153 +1933,153 @@
 " forbid-version - EstÃ¤ aptitudea pÃ¤ivittÃ¤mÃ¤stÃ¤ pakettia mÃ¤Ã¤ritettyyn "
 "versioon\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Nouda uusien ja pÃ¤ivitettÃ¤vien pakettien listat\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade       - PÃ¤ivitÃ¤ turvallisesti\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, 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:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - TyhjennÃ¤ uusien pakettien lista\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, 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:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - NÃ¤ytÃ¤ paketin yksityiskohtaiset tiedot\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Poista noudetut pakettitiedostot\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Poista vanhat noudetut pakettitiedostot\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " muutosloki   - NÃ¤ytÃ¤ paketin muutosloki\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Nouda pakettitiedosto\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Valitsimet:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             TÃ¤mÃ¤ avustusteksti\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, 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:114
+#: src/main.cc:116
 #, 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:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Kysy aina varmistusta tai toimintoa\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, 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:117
+#: src/main.cc:119
 #, 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:118
+#: src/main.cc:120
 #, 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:119
+#: src/main.cc:121
 #, 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:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             YritÃ¤ tosissaan korjata rikkinÃ¤isten pakettien "
 "riippuvuuksia.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, 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:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             NÃ¤ytÃ¤ automaattisesti muutettujen pakettien riippuvuudet.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, 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:124
+#: src/main.cc:126
 #, 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:125
+#: src/main.cc:127
 #, 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:126
+#: src/main.cc:128
 #, 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:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1987,62 +2088,62 @@
 " --with(out)-recommends\tMÃ¤Ã¤ritÃ¤, kÃ¤sitellÃ¤Ã¤nkÃ¶ suosituksia\n"
 "                riippuvuuksina\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, 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:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Aloita pakettilistojen pÃ¤ivitys kÃ¤ynnistettÃ¤essÃ¤.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : NÃ¤ytÃ¤ toimenpideruutu kÃ¤ynnistettÃ¤essÃ¤.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                      TÃ¤llÃ¤ aptitudella ei ole LehmÃ¤voimia.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, 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:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "OUTOA: tuntematon valitsin\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 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:325
+#: src/main.cc:327
 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:342
+#: src/main.cc:348
 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:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Tuntematon komento \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2073,7 +2174,7 @@
 msgid "Lost"
 msgstr "HÃ¤viÃ¶"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Miinaharava"
 
@@ -2248,7 +2349,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paketti"
 
@@ -3725,52 +3826,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Ã–Ã¶, mitÃ¤Ã¤n virheitÃ¤ ei ole; nÃ¤in ei olisi pitÃ¤nyt kÃ¤ydÃ¤..."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Etsi mitÃ¤? "
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Olet jo root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Lapsiprosessi palautti virhekoodin -- kirjoititko salasanan oikein?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Lataan varastoa"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Haluatko varmasti lopettaa?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Haluatko varmasti hylÃ¤tÃ¤ omat asetuksesi ja korvata ne oletuksilla?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Paketit"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Selaa saatavilla olevia paketteja ja suorita toimenpiteitÃ¤"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3786,15 +3887,15 @@
 "Avustus-valikosta.  TÃ¤mÃ¤ on vapaa ohjelma, joten saat vapaasti levittÃ¤Ã¤\n"
 "sitÃ¤ tietyin rajoituksin; 'lisenssi' antaa tarkemmat tiedot (englanniksi)."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-fi.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3802,45 +3903,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Jatka"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Pakettien asennuksen esikatselu"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "NÃ¤ytÃ¤ toiminnot, jotka suoritetaan, ja muuta niitÃ¤"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Edellinen"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Jotkut paketit olivat rikki, mutta ovat nyt kunnossa"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3849,23 +3950,23 @@
 "Pakettien asentaminen ja poisto vaativat yllÃ¤pitÃ¤jÃ¤n oikeudet, joita\n"
 "sinulla ei ole.  Haluatko vaihtaa root-tunnukselle?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Vaihda root-tunnukselle"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Ã„lÃ¤ vaihda root-tunnukselle"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "Asennus tai pakettilistan pÃ¤ivitys on jo kÃ¤ynnissÃ¤."
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "MitÃ¤Ã¤n paketteja ei asenneta, pÃ¤ivitetÃ¤ tai poisteta."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3877,7 +3978,7 @@
 "Jotkin paketit olisi mahdollista pÃ¤ivittÃ¤Ã¤.\n"
 "Paina \"U\" pÃ¤ivittÃ¤Ã¤ksesi nÃ¤mÃ¤."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3886,100 +3987,113 @@
 "Pakettilistojen pÃ¤ivitys vaatii yllÃ¤pitÃ¤jÃ¤n oikeudet, joita sinulla\n"
 "ei ole.  Haluatko vaihtaa root-tunnukselle?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Hukkaa aikaa etsimÃ¤llÃ¤ miinoja"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Puhdistusta ei voi tehdÃ¤ noudon aikana"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "Poistan noudettuja tiedostoja"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Noudetut pakettitiedostot on poistettu"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Vanhentuneet pakettitiedostot on poistettu"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Hukkaa aikaa etsimÃ¤llÃ¤ miinoja"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "En pysty kirjoittamaan tiedostoon %s"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Asenna/poista paketteja"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Suorita kaikki mÃ¤Ã¤ritetyt asennukset ja poistot"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^PÃ¤ivitÃ¤ pakettilista"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "PÃ¤ivitÃ¤ saatavilla olevien pakettien lista"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Unohda uudet paketit"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "TyhjennÃ¤ uusien pakettien lista"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "Puhdista ^koko pakettivarasto"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Poista aiemmin noudetut pakettitiedostot"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Puhdista ^vanhentuneet tiedostot"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Poista pakettitiedostot, joita ei enÃ¤Ã¤ voi noutaa"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "^Merkitse pÃ¤ivitykset"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "Pelaa miina^haravaa"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Vaihda ^root-tunnukselle"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3988,78 +4102,78 @@
 "Vaihda root-tunnukselle komennolla 'su'.  TÃ¤mÃ¤ kÃ¤ynnistÃ¤Ã¤ ohjelman\n"
 "uudelleen, mutta asetuksesi sÃ¤ilyvÃ¤t nykyisellÃ¤Ã¤n."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "Lataa ^pakettivarasto uudelleen"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Lataa pakettivarasto uudelleen muistiin."
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Lopeta"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Peruuta"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Peruuta viimeisin suoritettu toimi tai toimiryhmÃ¤"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Asenna"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merkitse valittu paketti asennettavaksi tai pÃ¤ivitettÃ¤vÃ¤ksi"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Poista"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Merkitse valittu paketti poistettavaksi"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Siivoa"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Merkitse valittu paketti asetustiedostoineen poistettavaksi"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "Pala^uta"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Peruuta valitulle paketille mÃ¤Ã¤ritetyt toiminnot"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^JÃ¤Ã¤dytÃ¤"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 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:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "^Merkitse Automaatti"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4068,11 +4182,11 @@
 "Merkitse valittu paketti automaattisesti asennetuksi; se poistetaan,\n"
 "jos mikÃ¤Ã¤n muu paketti ei riipu siitÃ¤"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Merkitse ^KÃ¤sin"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4081,11 +4195,11 @@
 "Merkitse valittu paketti kÃ¤sin asennetuksi; sitÃ¤ ei poisteta, ellet\n"
 "poista sitÃ¤ kÃ¤sin"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^EstÃ¤ versio"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4094,214 +4208,214 @@
 "EstÃ¤ valitun paketin ehdolla olevan version asennus; paketin uudemmat\n"
 "versiot asennetaan normaalisti"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "^Tiedot"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "NÃ¤ytÃ¤ lisÃ¤tietoa valitusta paketista"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "Muutos^loki"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "NÃ¤ytÃ¤ valitun paketin Debian-muutosloki"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Etsi"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Etsi pakettia"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Etsi ^Uudestaan"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Toista edellinen haku"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Rajoita NÃ¤kymÃ¤"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Rajoita nÃ¤kyvien pakettien listaa suodattimella"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Laajenna NÃ¤kymÃ¤"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Poista pakettilistan suodatin"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "^Hae rikkinÃ¤iset"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Etsi seuraava paketti, jonka riippuvuudet eivÃ¤t ole kunnossa"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^KÃ¤yttÃ¶liittymÃ¤"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Muuta kÃ¤yttÃ¶liittymÃ¤Ã¤n vaikuttavia asetuksia"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Riippuvuuksien kÃ¤sittely"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Muuta pakettien riippuvuuksien kÃ¤sittelyyn vaikuttavia asetuksia"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Sekalaista"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Muuta sekalaisia asetuksia"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Palauta oletukset"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Palauta kaikki asetukset ohjelman oletusasetuksiin"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Seuraava"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Siirry seuraavaan nÃ¤yttÃ¶Ã¶n"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Edellinen"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Siirry edelliseen nÃ¤yttÃ¶Ã¶n"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Lopeta"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Sulje tÃ¤mÃ¤ nÃ¤yttÃ¶"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Uusi paketti^nÃ¤kymÃ¤"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Luo uusi oletusnÃ¤kymÃ¤"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "^Uusi luokkaselain"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Selaa paketteja luokittain"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Tietoja"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Tietoja tÃ¤stÃ¤ ohjelmasta"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Pika-apu"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Selaa sisÃ¤Ã¤nrakennettua avustustekstiÃ¤"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^KÃ¤yttÃ¶ohje"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "NÃ¤ytÃ¤ ohjelman varsinainen kÃ¤yttÃ¶ohje"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^UKK"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "NÃ¤ytÃ¤ usein kysyttyjÃ¤ kysymyksiÃ¤ vastauksineen"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "NÃ¤ytÃ¤ ohjelman eri versioissa tehdyt muutokset"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Lisenssi"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "NÃ¤ytÃ¤ ohjelman kopiointiehdot"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Haku"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Asetukset"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "NÃ¤kymÃ¤t"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Apu"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr "%s: Valikko  %s: Apu  %s: Lopeta  %s: PÃ¤ivitÃ¤  %s: Nouda/Asenna/Poista"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "kyllÃ¤"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ei"
 
@@ -4343,13 +4457,58 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Auts!  Tuli SIGQUIT, kuolen..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "KyllÃ¤"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Ei"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Komennot:\n"
+#~ "  y: jatka asennusta\n"
+#~ "  n: keskeytÃ¤ ja lopeta\n"
+#~ "  i: nÃ¤ytÃ¤ tiedot yhdestÃ¤ tai useammasta paketista;\n"
+#~ "     pakettien nimet luetellaan 'i':n jÃ¤lkeen\n"
+#~ "  c: nÃ¤ytÃ¤ Debianin muutoslokit yhdestÃ¤ tai useammasta paketista;\n"
+#~ "     pakettien nimet luetellaan 'c':n jÃ¤lkeen\n"
+#~ "  d: nÃ¤ytÃ¤/Ã¤lÃ¤ nÃ¤ytÃ¤ riippuvuustietoja\n"
+#~ "  s: nÃ¤ytÃ¤/Ã¤lÃ¤ nÃ¤ytÃ¤ pakettien kokojen muutoksia\n"
+#~ "  v: nÃ¤ytÃ¤/Ã¤lÃ¤ nÃ¤ytÃ¤ versioita\n"
+#~ "  e: siirry kokoruutuliittymÃ¤Ã¤n\n"
+#~ "\n"
+#~ "  Voit myÃ¶s mÃ¤Ã¤rittÃ¤Ã¤ muutoksia paketeille tehtÃ¤viin toimenpiteisiin.\n"
+#~ "  Tee tÃ¤mÃ¤ kirjoittamalla toimintomerkki ja sen jÃ¤lkeen yksi tai "
+#~ "useampia\n"
+#~ "pakettien nimiÃ¤ tai hakuehtoja.  Toiminto suoritetaan kaikille "
+#~ "antamillesi\n"
+#~ "paketeille.  Voit antaa useita toimintoja; kukin suoritetaan kaikille "
+#~ "sitÃ¤\n"
+#~ "seuraaville paketeille\n"
+#~ "\n"
+#~ "Toiminnot:\n"
+#~ "  + : Asenna\n"
+#~ "  - : Poista\n"
+#~ "  _ : Siivoa\n"
+#~ "  = : JÃ¤Ã¤dytÃ¤\n"
 
 # This needs to be synchronized with apt's translation, if that ever happens
 # JJK
@@ -4548,9 +4707,6 @@
 #~ msgid "Installed Packages"
 #~ msgstr "Asennetut paketit"
 
-#~ msgid "Not Installed Packages"
-#~ msgstr "Asentamattomat paketit"
-
 #~ msgid "Obsolete and Locally Created Packages"
 #~ msgstr "Vanhentuneet ja itsetehdyt paketit"
 

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	Sun May  1 17:18:21 2005
@@ -9,7 +9,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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-10-05 06:55+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -152,7 +152,7 @@
 msgstr "Supprimer les paquets inutilisÃ©s correspondant Ã  ce filtre"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Continuer"
@@ -295,55 +295,55 @@
 "NoteÂ : sÃ©lection de Â«Â %sÂ Â» Ã  la place du\n"
 "       paquet virtuel Â«Â %sÂ Â»\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s est dÃ©jÃ  installÃ© avec la version demandÃ©e (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s n'est pas actuellement installÃ©, il ne sera donc pas rÃ©installÃ©.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Le paquet %s n'est pas installÃ©, il ne sera donc pas enlevÃ©\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Le paquet %s n'est pas installÃ©, l'interdiction de mise Ã  jour n'est pas "
 "possible\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Le paquet %s n'est pas susceptible d'Ãªtre mis Ã  jour, l'interdiction de mise "
 "Ã  jour n'est pas possible\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "NoteÂ : sÃ©lection de la tÃ¢che Â«Â %sÂ : %sÂ Â» pour installation\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 "Vous ne pouvez spÃ©cifier qu'une version de paquet avec une commande "
 "Â«Â installÂ Â»\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "Vous ne pouvez spÃ©cifier qu'une archive de paquet avec une commande "
 "Â«Â installÂ Â»\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -352,7 +352,7 @@
 "Impossible de trouver le paquet Â«Â %sÂ Â» et plus de 40\n"
 "paquets comportent Â«Â %sÂ Â» dans leur nom.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -361,14 +361,14 @@
 "Impossible de trouver le paquet Â«Â %sÂ Â». Cependant, les\n"
 "paquets suivants comportent Â«Â %sÂ Â» dans leur nomÂ :\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Impossible de trouver un paquet dont le nom ou la description correspond Ã  "
 "Â«Â %sÂ Â»\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -377,7 +377,7 @@
 "Impossible de trouver un paquet correspondant Ã  Â«Â %sÂ Â»\n"
 "et plus de 40 paquets comportent Â«Â %sÂ Â» dans leur description.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -386,6 +386,11 @@
 "Impossible de trouver un paquet correspondant Ã  Â«Â %sÂ Â». Cependant,\n"
 "les paquets suivants comportent Â«Â %sÂ Â» dans leur descriptionÂ :\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Le caractÃ¨re %c ne correspond Ã  aucune action connue\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -429,7 +434,7 @@
 msgid "Invalid operation %s"
 msgstr "OpÃ©ration invalide %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -441,16 +446,16 @@
 msgstr ""
 "tÃ©lÃ©chargementÂ : vous devez spÃ©cifier au moins un paquet Ã  tÃ©lÃ©charger\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Impossible de lire la liste des sources"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Impossible de trouver un paquet appelÃ© Â«Â %sÂ Â»"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -510,95 +515,95 @@
 "Qu'est-ce que c'estÂ ? C'est un Ã©lÃ©phant qui se fait manger par un\n"
 "serpent, bien sÃ»r.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Impossible de lire la liste des sources"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "mais %s doit Ãªtre installÃ©"
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "mais %s est installÃ© et a Ã©tÃ© conservÃ©"
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "mais %s est installÃ©"
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "mais il n'est pas installable"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr "qui est un paquet virtuel"
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr "ou"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Les paquets suivants sont CASSÃ‰SÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Les paquets suivants ne sont pas utilisÃ©s et vont Ãªtre ENLEVÃ‰SÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Les paquets suivants ont Ã©tÃ© conservÃ©s automatiquementÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Les NOUVEAUX paquets suivants vont Ãªtre automatiquement installÃ©sÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Les paquets suivants seront automatiquement ENLEVÃ‰SÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Les paquets suivants vont Ãªtre RÃ‰INSTALLÃ‰S Ã  une VERSION ANTÃ‰RIEUREÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Les paquets suivants ont Ã©tÃ© conservÃ©sÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Les paquets suivants seront RÃ‰INSTALLÃ‰SÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Les NOUVEAUX paquets suivants vont Ãªtre installÃ©sÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Les paquets suivants seront ENLEVÃ‰SÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Les paquets suivants seront mis Ã  jourÂ : "
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Les paquets ESSENTIELS suivants vont Ãªtre ENLEVÃ‰SÂ !\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Les paquets ESSENTIELS suivants vont Ãªtre CASSÃ‰S par cette actionÂ :\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -608,102 +613,232 @@
 "       Ne PAS continuer Ã  moins que vous ne sachiez EXACTEMENT ce que vous "
 "faitesÂ !\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Je suis conscient que c'est une trÃ¨s mauvaise idÃ©e"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Pour continuer, entrer la phrase Â«Â %sÂ Â»Â :\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Oui"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Non"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Pour continuer, entrer la phrase Â«Â %sÂ Â»Â :\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 "Les paquets suivants sont RECOMMANDÃ‰S mais ne seront pas installÃ©sÂ : \n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Les paquets suivants sont SUGGÃ‰RÃ‰S mais ne seront pas installÃ©sÂ : \n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Aucun paquet ne va Ãªtre installÃ©, mis Ã  jour ou enlevÃ©.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquets mis Ã  jour, %lu nouvellement installÃ©s, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu rÃ©installÃ©s, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu remis Ã  une version antÃ©rieure, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu Ã  enlever et %lu non mis Ã  jour.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Il est nÃ©cessaire de tÃ©lÃ©charger %so/%so d'archives. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Il est nÃ©cessaire de tÃ©lÃ©charger %so d'archives. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "AprÃ¨s dÃ©paquetage, %so seront utilisÃ©s.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "AprÃ¨s dÃ©paquetage, %so seront libÃ©rÃ©s.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Le caractÃ¨re %c ne correspond Ã  aucune action connue\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Aucun paquet Ã  afficher - indiquez les noms de paquets Ã  la suite de Â«Â iÂ Â».\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Appuyez sur EntrÃ©e pour continuer."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Aucun paquet trouvÃ© - indiquez les noms de paquets Ã  la suite de Â«Â cÂ Â».\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Appuyez sur EntrÃ©e pour continuer."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Format d'affichage pour les vues des paquets"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Installer/enlever des paquets"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Les NOUVEAUX paquets suivants vont Ãªtre automatiquement installÃ©sÂ : "
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Installer/enlever des paquets"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Oublier les nouveaux paquets"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Garde ce paquet\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+" markauto     - Marque les paquets comme ayant Ã©tÃ© automatiquement "
+"installÃ©s\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+" unmarkauto   - Marque les paquets comme ayant Ã©tÃ© manuellement installÃ©s\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "recommande"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Voulez-vous continuerÂ ? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -714,7 +849,7 @@
 "Les informations de dÃ©pendances seront affichÃ©es.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -725,7 +860,7 @@
 "Les informations de dÃ©pendances ne seront pas affichÃ©es.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -736,7 +871,7 @@
 "Les versions seront affichÃ©es.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -747,7 +882,7 @@
 "Les versions ne seront pas affichÃ©es.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -758,7 +893,7 @@
 "Les changements de taille seront affichÃ©s.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -769,137 +904,108 @@
 "Les changements de taille ne seront pas affichÃ©s.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"CommandesÂ :\n"
-"  yÂ : poursuivre l'installation\n"
-"  nÂ : abandonner et quitter\n"
-"  iÂ : afficher les informations d'un ou plusieurs\n"
-"      paquets. Entrer les noms de paquets aprÃ¨s\n"
-"      la commande Â«Â iÂ Â».\n"
-"  cÂ : montrer les journaux de modifications Debian (fichiers\n"
-"       Â« changelog Â») d'un ou plusieurs paquets. Entrer\n"
-"        les noms de paquets aprÃ¨s la commande Â« c Â».\n"
-"  dÂ : basculement de l'affichage des informations de dÃ©pendances\n"
-"  sÂ : basculement de l'affichage des changements de taille des paquets\n"
-"  vÂ : basculement de l'affichage des versions\n"
-"  eÂ : basculer vers l'interface visuelle\n"
-"\n"
-"  Vous pouvez aussi prÃ©ciser les modifications pour les actions.\n"
-"  Pour ce faire, entrez un caractÃ¨re d'action suivi par un ou plusieurs "
-"noms\n"
-"  de paquets ou des motifs. Les actions seront appliquÃ©es sur tous les\n"
-"  paquets. (Vous pouvez prÃ©ciser des actions supplÃ©mentairesÂ : chacune\n"
-" d'entre elles sera appliquÃ©e Ã  tous les paquets qui la suivent)\n"
-"\n"
-"ActionsÂ :\n"
-" +Â : Installer\n"
-" -Â : Enlever\n"
-" _Â : Purger\n"
-" =Â : Retenir\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "RÃ©ponse incorrecte. Veuillez entrer une commande correcte ou Â«Â ?Â Â» pour "
 "obtenir de l'aide.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Quitter le programme"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, 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:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Les paquets suivants sont CASSÃ‰SÂ : "
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, 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
 #, 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:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, 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:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1198,7 +1304,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Effacement des fichiers tÃ©lÃ©chargÃ©s pÃ©rimÃ©s"
 
@@ -1491,27 +1597,22 @@
 "Impossible de corriger les dÃ©pendances, certains paquets ne peuvent pas Ãªtre "
 "installÃ©s"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "La liste des sources ne peut pas Ãªtre lue."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Les listes de paquets ou le fichier d'Ã©tat ne peuvent pas Ãªtre ouverts, ou "
 "sont incomprÃ©hensibles."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Vous devriez mettre la liste des paquets Ã  jour pour corriger ces\n"
 "fichiers manquants."
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Impossible d'ouvrir %s en Ã©criture"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1803,17 +1904,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Type de rÃ¨gle de tri Â«Â %sÂ Â» incorrect"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilÃ© le %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "CompilateurÂ : g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1822,7 +1923,7 @@
 "\n"
 "Version de NCursesÂ : %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1831,22 +1932,22 @@
 "\n"
 "Version de CursesÂ : %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "Version de libsigc++Â : %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "UtilisationÂ : aptitude [-S NomFichier] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr " | aptitude [options] <action> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1855,46 +1956,46 @@
 " Actions (si aucune n'est spÃ©cifiÃ©e, aptitude entrera en mode interactif)Â :\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Installe ou met Ã  jour des paquets\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Supprime les paquets\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 " purge        - Supprime les paquets et leurs fichiers de configuration\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Garde ce paquet\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Annule une commande pour garder un paquet\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 " markauto     - Marque les paquets comme ayant Ã©tÃ© automatiquement "
 "installÃ©s\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 " unmarkauto   - Marque les paquets comme ayant Ã©tÃ© manuellement installÃ©s\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1903,18 +2004,18 @@
 " forbid-version - Interdit Ã  aptitude la mise Ã  jour vers une version "
 "spÃ©cifique de paquet.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 " update       - TÃ©lÃ©charger les listes de paquets nouveaux/Ã  mettre Ã  jour\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Effectue une mise Ã  jour en toute sÃ©curitÃ©\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1923,60 +2024,60 @@
 " dist-upgrade - Effectue une mise Ã  jour, faisant Ã©ventuellement des\n"
 "                installations et suppressions de paquets\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Oublie quels paquets sont Â«Â nouveauxÂ Â Â»\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 " search       - Recherche des paquets en spÃ©cifiant leur nom ou une "
 "expression\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 " show         - Affiche les informations dÃ©taillÃ©es concernant un paquet\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Efface les fichiers des paquets tÃ©lÃ©chargÃ©s\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Efface les anciens fichiers des paquets tÃ©lÃ©chargÃ©s\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Voir le journal des modifications d'un paquet\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - TÃ©lÃ©charge le fichier .deb d'un paquet\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  OptionsÂ :\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Affiche ce texte d'aide\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simule les actions, sans les effectuer rÃ©ellement\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1984,19 +2085,19 @@
 " -d             Effectue uniquement le tÃ©lÃ©chargement d'un paquet, sans\n"
 "                installer ou enlever quoi que ce soit.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Demande toujours confirmation pour les actions\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 " -y             Suppose que la rÃ©ponse Ã  des questions oui/non est Â«Â ouiÂ Â»\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -2005,7 +2106,7 @@
 " -F format      SpÃ©cifie un format pour l'affichage des rÃ©sultats d'une\n"
 "                rechercheÂ ; voir le manuel\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -2013,7 +2114,7 @@
 " -O ordre       SpÃ©cifie comment les rÃ©sultats d'une recherche doivent Ãªtre\n"
 "                ordonnÃ©sÂ ; voir le manuel\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -2021,19 +2122,19 @@
 " -w largeur     SpÃ©cifie la largeur de l'affichage pour le formatage des\n"
 "                rÃ©sultats d'une recherche\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Tente de corriger de maniÃ¨re agressive les paquets cassÃ©s.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Affiche quelles versions des paquets vont Ãªtre installÃ©es.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -2041,14 +2142,14 @@
 " -D             Affiche les dÃ©pendances des paquets qui sont modifiÃ©s\n"
 "                automatiquement.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Affiche les changements de la taille de chacun des paquets\n"
 "                aprÃ¨s installation.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -2056,7 +2157,7 @@
 " -v             Affiche des informations supplÃ©mentaires (peut Ãªtre\n"
 "                indiquÃ© plusieurs fois).\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -2064,14 +2165,14 @@
 " -t [dist]      Indique la distribution pour laquelle le paquet doit Ãªtre\n"
 "                installÃ©\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o clÃ©=valeur  Ã‰tablit directement l'option de configuration appelÃ©e\n"
 "                Â« clÃ© Â»\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2080,68 +2181,68 @@
 " --with(out)-recommends\tPrÃ©cise s'il faut ou non considÃ©rer Â«Â recommendsÂ Â»\n"
 "                comme des dÃ©pendances fortes\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S nomficÂ :    Lit les informations d'Ã©tat Ã©tendu d'Aptitude Ã  partir du\n"
 "                fichier nomfic.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 " -u       Â :    TÃ©lÃ©charge les nouvelles listes de paquet au dÃ©marrage.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr ""
 " -i       Â :    Effectue une opÃ©ration d'installation lors du dÃ©marrage.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                 Cet aptitude n'a pas de Â«Â Super Cow PowersÂ Â».\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o a besoin d'un argument de la forme clÃ©=valeur (%s incorrect)"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "BIZARRERIEÂ : un code d'option inconnu a Ã©tÃ© reÃ§u\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Une seule des options -u ou -i doit Ãªtre spÃ©cifiÃ©e\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u et -i ne devraient pas Ãªtre spÃ©cifiÃ©s dans le mode ligne de commande (par "
 "exemple avec Â«Â installÂ Â»)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u et -i ne peuvent pas Ãªtre spÃ©cifiÃ©s avec une commande"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Commande inconnue Â«Â %sÂ Â»\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2172,7 +2273,7 @@
 msgid "Lost"
 msgstr "perdu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "DÃ©mineur"
 
@@ -2356,7 +2457,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paquet"
 
@@ -3871,56 +3972,56 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Bon, il n'y a pas eu d'erreur donc ceci n'aurait pas dÃ» se produire..."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Recherche deÂ : "
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Vous Ãªtes dÃ©jÃ  rootÂ !"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Le sous-processus s'est terminÃ© avec une erreur -- avez-vous entrÃ© votre mot "
 "de passe correctementÂ ?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr " Chargement du cache "
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr " Voulez-vous vraiment quitter AptitudeÂ ? "
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Voulez-vous vraiment perdre vos prÃ©fÃ©rences personnelles et\n"
 "recharger les valeurs par dÃ©fautÂ ?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Paquets"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Afficher les paquets disponibles et choisir les actions Ã  effectuer"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3937,15 +4038,15 @@
 "Ãªtes encouragÃ© Ã  le redistribuer sous certaines conditionsÂ ; consulter la\n"
 "Â«Â licenceÂ Â» pour plus de dÃ©tails."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-fr.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3953,45 +4054,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continuer"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "PrÃ©-visualisation de l'installation des paquets"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Voir ou modifier les actions qui seront effectuÃ©es"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^PrÃ©cÃ©dent"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, 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:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -4001,25 +4102,25 @@
 "d'administration que vous n'avez pas pour le moment. Voulez-vous\n"
 "utiliser le compte administrateurÂ ?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Devenir administrateur"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Ne pas devenir administrateur"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -4031,7 +4132,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:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4041,108 +4142,121 @@
 "que vous n'avez pas pour le moment. Voulez-vous utiliser le compte\n"
 "administrateurÂ ?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Effacement des fichiers tÃ©lÃ©chargÃ©s"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 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:1175
 #, 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:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, 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:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Impossible d'ouvrir %s en Ã©criture"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Installer/enlever des paquets"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr ""
 "Effectuer toutes les actions d'installation ou de suppression demandÃ©es"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Mettre Ã  jour les listes de paquets"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "VÃ©rifier s'il existe de nouvelles versions des paquets"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Oublier les nouveaux paquets"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Oublier quels paquets sont Â«Â nouveauxÂ Â»"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^Nettoyer le cache des paquets"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Effacer les fichiers de paquets prÃ©cÃ©demment tÃ©lÃ©chargÃ©s"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Nettoyer les fichiers ^pÃ©rimÃ©s"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Marquer comme Ã©tant susceptible de mise Ã  ^jour"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "Jouer au ^dÃ©mineur"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Devenir ^administrateur"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4151,70 +4265,70 @@
 "Utilisez la commande Â«Â suÂ Â» pour devenir administrateur.\n"
 "Cela relancera le programme mais vos prÃ©fÃ©rences seront conservÃ©es"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Recharger le cache des paquets"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Recharger le cache des paquets"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Quitter"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Quitter le programme"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "DÃ©faire"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "DÃ©faire la derniÃ¨re opÃ©ration ou groupe d'opÃ©rations sur les paquets"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marquer le paquet sÃ©lectionnÃ© pour installation ou mise Ã  jour"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Supprimer"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Marquer le paquet sÃ©lectionnÃ© pour suppression"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Purger"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Garder"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Annuler toute action sur le paquet sÃ©lectionnÃ©"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "G^eler"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4222,11 +4336,11 @@
 "Annuler toute action sur le paquet sÃ©lectionnÃ© et refuser toute mise Ã  jour "
 "ultÃ©rieure"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Marquer ^automatique"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4235,11 +4349,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:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Marquer ^manuel"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4248,11 +4362,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:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Interdire version"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4261,205 +4375,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:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformation"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Afficher plus d'informations sur le paquet sÃ©lectionnÃ©"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "Liste des ^modifications"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Afficher la liste des modifications (Â« changelog Â») du paquet sÃ©lectionnÃ©"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Rechercher"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Rechercher un paquet"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Rechercher ^encore"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Recommencer la recherche prÃ©cÃ©dente"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "Affichage ^restreint"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Filtrer la liste des paquets"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "Affichage ^complet"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Supprimer le filtre de la liste des paquets"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Rechercher ^cassÃ©s"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Rechercher le prochain paquet avec des dÃ©pendances non satisfaites"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "Options de l'Interface ^Utilisateur"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Modifier les paramÃ¨tres qui affectent l'interface utilisateur"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Gestion des DÃ©pendances"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Divers"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "^Modifier divers paramÃ¨tres du programme"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Revenir aux valeurs prÃ©cÃ©dentes des options"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Remettre tous les paramÃ¨tres Ã  leurs valeurs par dÃ©faut"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Suivant"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Affichage de l'Ã©cran suivant"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^PrÃ©cÃ©dent"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Affichage de l'Ã©cran prÃ©cÃ©dant"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Fermer"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Fermer cet Ã©cran"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Nouvelle ^Vue des Paquets"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "CrÃ©er une nouvelle vue par dÃ©faut des paquets"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Nouvelle vue par ^CatÃ©gories"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Parcourir les paquets par catÃ©gorie"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "A ^propos"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Afficher l'information Ã  propos de ce programme"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Aide"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Afficher l'aide en ligne d'Aptitude"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Manuel Utilisateur"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Afficher le manuel d'utilisation dÃ©taillÃ©"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Afficher la liste des questions souvent posÃ©es"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Afficher les changements importants de chaque version du programme"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Actions"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Options"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Vues"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Aide"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4467,11 +4581,11 @@
 "%sÂ : Menu  %sÂ : Aide  %sÂ : Quitter  %sÂ : M-Ã -J  %sÂ : TÃ©lÃ©ch./Inst./Suppr. "
 "Pqts"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "o"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
@@ -4515,13 +4629,58 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "OuilleÂ ! j'ai reÃ§u un SIGQUIT, je termine...\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Oui"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Non"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "CommandesÂ :\n"
+#~ "  yÂ : poursuivre l'installation\n"
+#~ "  nÂ : abandonner et quitter\n"
+#~ "  iÂ : afficher les informations d'un ou plusieurs\n"
+#~ "      paquets. Entrer les noms de paquets aprÃ¨s\n"
+#~ "      la commande Â«Â iÂ Â».\n"
+#~ "  cÂ : montrer les journaux de modifications Debian (fichiers\n"
+#~ "       Â« changelog Â») d'un ou plusieurs paquets. Entrer\n"
+#~ "        les noms de paquets aprÃ¨s la commande Â« c Â».\n"
+#~ "  dÂ : basculement de l'affichage des informations de dÃ©pendances\n"
+#~ "  sÂ : basculement de l'affichage des changements de taille des paquets\n"
+#~ "  vÂ : basculement de l'affichage des versions\n"
+#~ "  eÂ : basculer vers l'interface visuelle\n"
+#~ "\n"
+#~ "  Vous pouvez aussi prÃ©ciser les modifications pour les actions.\n"
+#~ "  Pour ce faire, entrez un caractÃ¨re d'action suivi par un ou plusieurs "
+#~ "noms\n"
+#~ "  de paquets ou des motifs. Les actions seront appliquÃ©es sur tous les\n"
+#~ "  paquets. (Vous pouvez prÃ©ciser des actions supplÃ©mentairesÂ : chacune\n"
+#~ " d'entre elles sera appliquÃ©e Ã  tous les paquets qui la suivent)\n"
+#~ "\n"
+#~ "ActionsÂ :\n"
+#~ " +Â : Installer\n"
+#~ " -Â : Enlever\n"
+#~ " _Â : Purger\n"
+#~ " =Â : Retenir\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-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"
@@ -147,7 +147,7 @@
 msgstr ""
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr ""
@@ -282,79 +282,84 @@
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "Paquetes para instalar"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: src/cmdline/cmdline_action.cc:106 src/cmdline/cmdline_action.cc:112
 #, fuzzy, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Paquetes para eliminar"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, fuzzy, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Paquetes para eliminar"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, fuzzy, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Paquetes para eliminar"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:265
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:268
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:294
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:297
+#: 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"
 msgstr ""
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr ""
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -394,7 +399,7 @@
 msgid "Invalid operation %s"
 msgstr "InformaciÃ³n de %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -405,16 +410,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "Erro interno: non se puido xera-la lista de paquetes para baixar"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Non se puido le-la lista de fontes"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -467,198 +472,321 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 #, fuzzy
 msgid "Couldn't read list of sources"
 msgstr "Non se puido le-la lista de fontes de paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, fuzzy, c-format
 msgid "but %s is to be installed."
 msgstr "Paquetes para instalar"
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 ""
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, fuzzy, c-format
 msgid "but %s is installed."
 msgstr "instalado"
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 #, fuzzy
 msgid "The following NEW packages will be installed:"
 msgstr "Paquetes para instalar"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 #, fuzzy
 msgid "The following packages will be upgraded:"
 msgstr "Paquetes para actualizar"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: 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"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, fuzzy, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Paquetes para instalar"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, fuzzy, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Paquetes para instalar"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, fuzzy, c-format
 msgid "%lu reinstalled, "
 msgstr "reinstalar"
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr ""
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 #, fuzzy
 msgid "Press Return to continue."
 msgstr "Prema Intro para continuar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Prema Intro para continuar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+msgid "toggle the display of changes in package sizes"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "Paquetes Non Instalados"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "Paquetes Instalados"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "Paquetes Novos"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+msgid "'=' to place packages on hold"
+msgstr ""
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr "Descargando e instalando os paquetes"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "SecciÃ³n"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -666,7 +794,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -674,7 +802,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -682,7 +810,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -690,7 +818,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -698,7 +826,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -706,103 +834,100 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "InformaciÃ³n de %s"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Paquetes para actualizar"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Paquetes para instalar"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, 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 "Invalid response; please enter one of the following commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr ""
@@ -1109,7 +1234,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
@@ -1400,26 +1525,21 @@
 "Non se puideron corrixi-las dependencias, non se pode instalar algÃºns "
 "paquetes"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Non se puido le-la lista de fontes."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Non se puido abrir ou analiza-la lista de paquetes ou o ficheiro de estado."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Pode precisar actualiza-la lista de paquetes para corrixir eses ficheiros "
 "que faltan"
 
-#: 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/generic/apt.cc:152
 #, fuzzy, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1683,298 +1803,298 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
 msgstr ""
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2006,7 +2126,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr ""
 
@@ -2183,7 +2303,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paquete"
 
@@ -3372,54 +3492,54 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr ""
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr ""
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr ""
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr ""
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 #, fuzzy
 msgid "Really quit Aptitude?"
 msgstr "Â¿Realmente quere saÃr?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 #, fuzzy
 msgid "Packages"
 msgstr "Paquete"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr ""
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
 "BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu.  This "
@@ -3427,17 +3547,17 @@
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 #, fuzzy
 msgid "help.txt"
 msgstr "/help-gl.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 #, fuzzy
 msgid "README"
 msgstr "BORRAR"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3445,496 +3565,509 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Â¿Realmente quere saÃr?"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "AlgÃºns paquetes estÃ¡n corrompidos. Â¿Arranxalos? "
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 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:1073
+#: src/ui.cc:1074
 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:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Non se puido abrir %s para rexistra-las acciÃ³ns"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 #, fuzzy
 msgid "^Install/remove packages"
 msgstr "Paquetes Instalados"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 #, fuzzy
 msgid "^Update package list"
 msgstr "Actualizando as listas de paquetes"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 #, fuzzy
 msgid "^Forget new packages"
 msgstr "Paquetes Novos"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 #, fuzzy
 msgid "^Install"
 msgstr "instalar"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 #, fuzzy
 msgid "^Purge"
 msgstr "purgar"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 #, fuzzy
 msgid "^Hold"
 msgstr "reter"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 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:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 #, fuzzy
 msgid "^Forbid Version"
 msgstr "VersiÃ³ns"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 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:1406
+#: src/ui.cc:1438
 #, fuzzy
 msgid "I^nformation"
 msgstr "InformaciÃ³n de %s"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 #, fuzzy
 msgid "Display more information about the selected package"
 msgstr "InformaciÃ³n de %s"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 #, fuzzy
 msgid "^Changelog"
 msgstr "Rexistro de modificaciÃ³ns de "
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 #, fuzzy
 msgid "Apply a filter to the package list"
 msgstr "Actualizando as listas de paquetes"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 #, fuzzy
 msgid "Find ^Broken"
 msgstr "corrupto"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 #, fuzzy
 msgid "New Package ^View"
 msgstr "Paquetes Novos"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 #, fuzzy
 msgid "View information about this program"
 msgstr "InformaciÃ³n de %s"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 #, fuzzy
 msgid "View the on-line help"
 msgstr "Axuda en liÃ±a de Aptitude"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 #, fuzzy
 msgid "Actions"
 msgstr "AcciÃ³n"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 #, fuzzy
 msgid "Options"
 msgstr "AcciÃ³n"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 #, fuzzy
 msgid "no_key"
 msgstr "nada"
@@ -3978,14 +4111,6 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr ""
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr ""
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr ""
-
 #, fuzzy
 #~ msgid ""
 #~ "Please insert the following disc into the drive \"%s\":\n"
@@ -4064,9 +4189,6 @@
 #~ msgid "Upgradable Packages"
 #~ msgstr "Paquetes Actualizables"
 
-#~ msgid "Not Installed Packages"
-#~ msgstr "Paquetes Non Instalados"
-
 #~ msgid "Virtual Packages"
 #~ msgstr "Paquetes Virtuais"
 

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	Sun May  1 17:18:21 2005
@@ -42,7 +42,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.7\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-09-17 22:37+0200\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza at libero.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -186,7 +186,7 @@
 msgstr "Filtro per i pacchetti inutilizzati"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -329,49 +329,49 @@
 "Nota: si sta selezionando Â«%sÂ» al posto del\n"
 "      pacchetto virtuale Â«%sÂ»\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s Ã¨ giÃ  installato e si trova alla versione richiesta (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s non Ã¨ attualmente installato e non verrÃ  quindi reinstallato.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Il pacchetto %s non Ã¨ installato e non verrÃ  quindi rimosso\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Il pacchetto %s non Ã¨ installato: impossibile proibirne l'aggiornamento\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Il pacchetto %s non Ã¨ aggiornabile: impossibile proibirne l'aggiornamento\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Nota: si sta selezionando il task Â«%s: %sÂ» per l'installazione\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Ãˆ possibile specificare solo la versione con il comando Â«installÂ».\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Ãˆ possibile specificare solo l'archivio con il comando Â«installÂ».\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -380,7 +380,7 @@
 "Impossibile trovare il pacchetto Â«%sÂ» e piÃ¹ di 40\n"
 "pacchetti hanno un nome che contiene Â«%sÂ».\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -389,14 +389,14 @@
 "Impossibile trovare il pacchetto Â«%sÂ». Ad ogni modo, i seguenti\n"
 "pacchetti hanno un nome che contiene Â«%sÂ»:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Impossibile trovare un pacchetto il cui nome o descrizione corrispondano a Â«%"
 "sÂ»\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -405,7 +405,7 @@
 "Impossibile trovare un pacchetto che corrisponda a Â«%sÂ» e piÃ¹ di 40\n"
 "pacchetti hanno un nome o una descrizione che contiene Â«%sÂ».\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -414,6 +414,11 @@
 "Impossibile trovare un pacchetto che corrisponda a Â«%sÂ». Ad ogni modo,\n"
 "i seguenti pacchetti hanno una descrizione che contiene Â«%sÂ»:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Il carattere Â«%cÂ» non descrive un'azione ammessa\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -455,7 +460,7 @@
 msgid "Invalid operation %s"
 msgstr "Operazione Â«%sÂ» non ammessa"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -466,16 +471,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "download: si deve specificare almeno un pacchetto da scaricare\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Impossibile leggere l'elenco delle sorgenti"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Impossibile trovare il pacchetto di nome Â«%sÂ»"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -531,96 +536,96 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Che cos'Ã¨? Ãˆ un elefante che viene mangiato da un boa, naturalmente.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Impossibile leggere l'elenco delle sorgenti"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "ma %s sta per essere installato."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "ma %s Ã¨ installato e viene mantenuto alla versione precedente."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ma %s Ã¨ installato."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "ma non Ã¨ installabile"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " che Ã¨ un pacchetto virtuale."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " o "
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "I seguenti pacchetti sono DIFETTOSI:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "I seguenti pacchetti sono inutilizzati e saranno RIMOSSI:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "I seguenti pacchetti sono stati mantenuti alla versione precedente:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "I seguenti pacchetti NUOVI (NEW) saranno automaticamente installati:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "I seguenti pacchetti saranno automaticamente RIMOSSI:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "I seguenti pacchetti sono stati bloccati:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "I seguenti pacchetti saranno REINSTALLATI:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "I seguenti pacchetti saranno RIMOSSI:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "I seguenti pacchetti saranno aggiornati:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "I seguenti pacchetti ESSENZIALI saranno RIMOSSI.\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "I seguenti pacchetti ESSENZIALI saranno DIFETTOSI dopo questa azione:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -631,101 +636,228 @@
 "            NON proseguire a meno che non si sappia ESATTAMENTE ciÃ² che si\n"
 "            sta per fare.\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "So che si tratta di una pessima idea"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Per continuare, inserire la frase Â«%sÂ»:\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "SÃ¬"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "No"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Per continuare, inserire la frase Â«%sÂ»:\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "I seguenti pacchetti sono RACCOMANDATI ma NON verranno installati:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "I seguenti pacchetti sono CONSIGLIATI ma NON verranno installati:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nessun pacchetto verrÃ  installato, aggiornato o rimosso.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pacchetti aggiornati, %lu installati, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstallati, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu retrocessi (downgraded), "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu da rimuovere e %lu non aggiornati.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Ãˆ necessario prelevare %sB/%sB di archivi. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Ãˆ necessario prelevare %sB di archivi. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Dopo l'estrazione, verranno occupati %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Dopo l'estrazione, verranno liberati %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Il carattere Â«%cÂ» non descrive un'azione ammessa\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Nessun pacchetto da mostrare; specificare i nomi dei pacchetti dopo Â«iÂ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Premere Invio per continuare."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nessun pacchetto da mostrare; specificare i nomi dei pacchetti dopo Â«cÂ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Premere Invio per continuare."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Formato delle viste dei pacchetti"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Installa/rimuovi pacchetti"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "I seguenti pacchetti NUOVI (NEW) saranno automaticamente installati:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Installa/rimuovi pacchetti"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Dimentica i nuovi pacchetti"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Imposta i pacchetti come bloccati\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - Segna i pacchetti come installati automaticamente\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - Segna i pacchetti come installati manualmente\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "raccomanda"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Continuare? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -736,7 +868,7 @@
 "Le informazioni sulle dipendenze vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -747,7 +879,7 @@
 "Le informazioni sulle dipendenze non vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -758,7 +890,7 @@
 "Le versioni vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -769,7 +901,7 @@
 "Le versioni non vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -780,7 +912,7 @@
 "Le variazioni dello spazio occupato vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -791,129 +923,102 @@
 "Le variazioni dello spazio occupato non vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Comandi:\n"
-"  y: continua l'installazione\n"
-"  n: abbandona ed esci\n"
-"  i: mostra informazioni su uno o piÃ¹ pacchetti,\n"
-"     elencati dopo Â«iÂ»\n"
-"  c: mostra i changelog Debian di uno o piÃ¹ pacchetti,\n"
-"     elencati dopo Â«cÂ»\n"
-"  d: mostra/nascondi le informazioni sulle dipendenze\n"
-"  s: mostra/nascondi le variazioni dello spazio occupato\n"
-"  v: mostra/nascondi le versioni\n"
-"  e: entra nell'interfaccia visuale\n"
-"\n"
-"  Si possono anche specificare modifiche nelle azioni da compiere.\n"
-"  Per farlo, inserire un carattere indicante un'azione seguito da uno o piÃ¹\n"
-"nomi di pacchetti o modelli. L'azione sarÃ  applicata a tutti i pacchetti.\n"
-"  Ãˆ possibile specificare ulteriori azioni, ognuna delle quali verrÃ  "
-"applicata\n"
-"a tutti i pacchetti che la seguono.\n"
-"\n"
-"Azioni:\n"
-"  + : Installa\n"
-"  - : Rimuovi\n"
-"  _ : Elimina\n"
-"  = : Blocca\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Risposta non ammessa. Immettere un comando valido o Â«?Â» per l'aiuto.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Esce dal programma"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "I seguenti pacchetti sono DIFETTOSI:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Errore nella scrittura del file di stato"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, 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:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, 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:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: si deve specificare almeno un'espressione di ricerca\n"
@@ -1213,7 +1318,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Cancellazione dei vecchi file scaricati"
 
@@ -1506,24 +1611,19 @@
 msgstr ""
 "Impossibile correggere le dipendenze; alcuni pacchetti non saranno installati"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Impossibile leggere l'elenco delle sorgenti."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Impossibile analizzare o aprire l'elenco dei pacchetti o il file di stato."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "Aggiornare l'elenco dei pacchetti per correggere questi file mancanti."
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Impossibile aprire %s in scrittura"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1810,17 +1910,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo di criterio di ordinamento Â«%sÂ» non ammesso"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilato il %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilatore: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1829,7 +1929,7 @@
 "\n"
 "Versione di NCurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1838,22 +1938,22 @@
 "\n"
 "Versione di Curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "Versione di libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Uso: aptitude [-S nomefile] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opzioni] <azione> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1862,42 +1962,42 @@
 "  Azioni (se omesse, Aptitude entrerÃ  nella modalitÃ  interattiva):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Installa/aggiorna pacchetti\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Rimuove pacchetti\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Elimina i pacchetti e i loro file di configurazione\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Imposta i pacchetti come bloccati\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Rimuove il blocco ad un pacchetto bloccato\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - Segna i pacchetti come installati automaticamente\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Segna i pacchetti come installati manualmente\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1906,17 +2006,17 @@
 " forbid-version - Impedisce di aggiornare un pacchetto ad una determinata "
 "versione.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Scarica l'elenco dei pacchetti nuovi/da aggiornare\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Esegue un aggiornamento sicuro\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1925,57 +2025,57 @@
 " dist-upgrade - Esegue un aggiornamento, eventualmente installando e\n"
 "                rimuovendo pacchetti\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Dimentica quali pacchetti sono Â«nuoviÂ»\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Cerca un pacchetto per nome o espressione\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Mostra informazioni dettagliate su un pacchetto\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Cancella i file dei pacchetti scaricati\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Cancella i file dei vecchi pacchetti scaricati\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Mostra il changelog di un pacchetto\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Scarica il file .deb di un pacchetto\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opzioni:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Questo help\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simula le azioni, senza eseguirle realmente\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1983,19 +2083,19 @@
 " -d             Scarica i pacchetti e basta, senza installare o rimuovere "
 "nulla\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Chiede sempre conferma prima di un'azione\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 " -y             Suppone che la risposta a semplici domande sÃ¬/no sia Â«sÃ¬Â»\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -2005,7 +2105,7 @@
 "ricerca;\n"
 "                vedere anche il manuale\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -2013,7 +2113,7 @@
 " -O ordine      Specifica come ordinare i risultati di una ricerca; vedere\n"
 "                anche il manuale\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -2021,51 +2121,51 @@
 " -w larghezza   Specifica la larghezza per mostrare i risultati di una "
 "ricerca\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Prova in tutti i modi a correggere i pacchetti difettosi\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Mostra quali versioni dei pacchetti si sta per installare\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Mostra le dipendenze dei pacchetti cambiati automaticamente\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Mostra i cambiamenti nella dimensione occupata da ogni "
 "pacchetto\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 " -v             Mostra informazioni extra (puÃ² essere fornita piÃ¹ volte)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [release]   Imposta la release da cui installare i pacchetti\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o chiave=val  Imposta l'opzione di configurazione di nome Â«chiaveÂ»\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2074,63 +2174,63 @@
 " --with(out)-recommends\tSpecifica se trattare Raccomanda come\n"
 "                una dipendenza forte\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S nomefile: Legge lo stato esteso di Aptitude da nomefile\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u         : Scarica il nuovo elenco dei pacchetti all'avvio\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i         : Esegue un'installazione all'avvio\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Questo Aptitude non ha i Poteri della Super Mucca.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o richiede un argomento nel formato chiave=valore, invece di Â«%sÂ»"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "STRANEZZA: ricevuto un codice di opzione sconosciuto\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "-u e -i non possono essere specificate contemporaneamente\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u e -i non sono ammesse in modalitÃ  riga di comando (es. con Â«installÂ»)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u e -i non possono essere specificate insieme a un comando"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Comando sconosciuto: Â«%sÂ»\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2161,7 +2261,7 @@
 msgid "Lost"
 msgstr "Perso"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Campo minato"
 
@@ -2340,7 +2440,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pacchetto"
 
@@ -3840,53 +3940,53 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Ehm, non c'Ã¨ alcun errore, questo non avrebbe dovuto verificarsi..."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Cerca:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Si Ã¨ giÃ  root."
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Il sottoprocesso ha restituito un errore: forse la password non Ã¨ corretta."
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Caricamento della cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Uscire da Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Abbandonare le impostazioni personali e tornare a quelle predefinite?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pacchetti"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Mostra i pacchetti disponibili e sceglie le azioni da eseguire"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3903,15 +4003,15 @@
 "ridistribuzione sotto determinate condizioni; fare riferimento a Â«licenzaÂ»\n"
 "per maggiori dettagli."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-it.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3919,45 +4019,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continua"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Anteprima dell'installazione dei pacchetti"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Mostra e modifica le azioni da compiere"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Precedente"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alcuni pacchetti erano difettosi e sono stati corretti"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3966,24 +4066,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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Diventa root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Non diventare root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Non ci sono pacchetti da installare, rimuovere o aggiornare."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3995,7 +4095,7 @@
 "Alcuni pacchetti potrebbero venire aggiornati ma si Ã¨ scelto di non farlo.\n"
 "Premere Â«UÂ» per preparare un aggiornamento."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -4005,103 +4105,116 @@
 "amministratore,\n"
 "dei quali attualmente si Ã¨ privi. Passare all'account di root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Cancellazione dei file scaricati"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "I file dei pacchetti scaricati sono stati cancellati"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, 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:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, 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:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Impossibile aprire %s in scrittura"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Installa/rimuovi pacchetti"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Procede ad installare e rimuovere i pacchetti"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Aggiorna l'elenco dei pacchetti"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Cerca nuove versioni dei pacchetti"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Dimentica i nuovi pacchetti"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Dimentica quali pacchetti sono Â«nuoviÂ»"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^Pulisci la cache dei pacchetti"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Cancella i file dei pacchetti scaricati precedentemente"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "^Cancella i file vecchi"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Aggiorna ^tutti i pacchetti"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Gioca a campo minato"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Diventa ^root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4110,80 +4223,80 @@
 "Esegue Â«suÂ» per diventare root; questo farÃ  ripartire il programma,\n"
 "mantenendo perÃ² le impostazioni attuali"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "Ricarica ^la cache dei pacchetti"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Ricarica la cache dei pacchetti"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Esci"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Esce dal programma"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Installa"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Richiede l'installazione e l'aggiornamento del pacchetto selezionato"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Rimuovi"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Richiede la rimozione del pacchetto selezionato"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Elimina"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Tieni"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Annulla ogni azione sul pacchetto selezionato"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Blocca"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 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:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Installato ^automaticamente"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4192,11 +4305,11 @@
 "Segna il pacchetto selezionato come installato automaticamente;\n"
 "verrÃ  rimosso automaticamente se nessun altro pacchetto dipende da esso"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Installato ^manualmente"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4205,11 +4318,11 @@
 "Segna il pacchetto selezionato come installato manualmente;\n"
 "non verrÃ  rimosso, a meno che non si intervenga manualmente"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Proibisci versione"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4219,208 +4332,208 @@
 "selezionato;\n"
 "le versioni successive verranno installate normalmente"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformazioni"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Mostra informazioni dettagliate sul pacchetto selezionato"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostra il changelog Debian del pacchetto selezionato"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Trova"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Cerca un pacchetto"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Trova ^successivo"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Ripete l'ultima ricerca"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Applica filtro"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Applica un filtro all'elenco dei pacchetti"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Rimuovi filtro"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Rimuove il filtro dall'elenco dei pacchetti"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Trova ^difettosi"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Trova il prossimo pacchetto con dipendenze non soddisfatte"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "Opzioni dell'interfaccia ^utente"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Cambia le impostazioni che riguardano l'interfaccia utente"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "Gestione delle ^dipendenze"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Varie"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Cambia altre impostazioni del programma"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Reimposta le opzioni"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Riporta tutte le impostazioni ai valori predefiniti"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Successivo"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Mostra la vista successiva"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Precedente"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Mostra la vista precedente"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Chiudi"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Chiude questa vista"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Nuova ^vista dei pacchetti"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Crea una nuova vista dei pacchetti"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Nuova vista per ^categorie"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Sfoglia i pacchetti per categoria"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Informazioni su"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Mostra le informazioni su questo programma"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Aiuto"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Mostra una breve guida online"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Manuale dell'utente"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Mostra il manuale dettagliato del programma"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Visualizza un elenco delle domande piÃ¹ frequenti"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, 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:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licenza"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Azioni"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Viste"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4428,12 +4541,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:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "s"
 
 # Put the appropriate key for Y/N choices here (lower case)
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
@@ -4475,13 +4588,58 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ricevuto il segnale SIGQUIT. Uscita immediata.\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "SÃ¬"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "No"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Comandi:\n"
+#~ "  y: continua l'installazione\n"
+#~ "  n: abbandona ed esci\n"
+#~ "  i: mostra informazioni su uno o piÃ¹ pacchetti,\n"
+#~ "     elencati dopo Â«iÂ»\n"
+#~ "  c: mostra i changelog Debian di uno o piÃ¹ pacchetti,\n"
+#~ "     elencati dopo Â«cÂ»\n"
+#~ "  d: mostra/nascondi le informazioni sulle dipendenze\n"
+#~ "  s: mostra/nascondi le variazioni dello spazio occupato\n"
+#~ "  v: mostra/nascondi le versioni\n"
+#~ "  e: entra nell'interfaccia visuale\n"
+#~ "\n"
+#~ "  Si possono anche specificare modifiche nelle azioni da compiere.\n"
+#~ "  Per farlo, inserire un carattere indicante un'azione seguito da uno o "
+#~ "piÃ¹\n"
+#~ "nomi di pacchetti o modelli. L'azione sarÃ  applicata a tutti i "
+#~ "pacchetti.\n"
+#~ "  Ãˆ possibile specificare ulteriori azioni, ognuna delle quali verrÃ  "
+#~ "applicata\n"
+#~ "a tutti i pacchetti che la seguono.\n"
+#~ "\n"
+#~ "Azioni:\n"
+#~ "  + : Installa\n"
+#~ "  - : Rimuovi\n"
+#~ "  _ : Elimina\n"
+#~ "  = : Blocca\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-09-20 11:01+0900\n"
 "Last-Translator: YasuoEto <yasuo at etou.org>\n"
 "Language-Team: \n"
@@ -148,7 +148,7 @@
 msgstr "ã“ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã«å½“ã¦ã¯ã¾ã‚‹ä½¿ã‚ã‚Œã¦ã„ãªã„ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’è‡ªå‹•çš„ã«å‰Šé™¤ã™ã‚‹"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "OK"
@@ -291,47 +291,47 @@
 "æ³¨: \"%s\" ã‚’\n"
 "    ä»®æƒ³ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ \"%s\" ã®æ›¿ã‚ã‚Šã«é¸æŠžã—ã¾ã—ãŸ\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s ã¯æ—¢ã«è¦æ±‚ã•ã‚ŒãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ (%s) ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s ã¯æ—¢ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã®ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã›ã‚“ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "%s ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„ã®ã§å‰Šé™¤ã—ã¾ã›ã‚“\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "%s ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„ã®ã§æ›´æ–°ç¦æ¢ã«ã§ãã¾ã›ã‚“\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "%s ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã§ããªã„ã®ã§æ›´æ–°ç¦æ¢ã«ã§ãã¾ã›ã‚“\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "æ³¨: ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚‹ \"%s: %s\" ã‚¿ã‚¹ã‚¯ã‚’é¸æŠžã—ã¾ã™\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "'install'ã‚³ãƒžãƒ³ãƒ‰ã¯ç‰¹å®šã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’æŒ‡å®šã§ãã¾ã™ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "'install'ã‚³ãƒžãƒ³ãƒ‰ã¯ç‰¹å®šã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’æŒ‡å®šã§ãã¾ã™ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -340,7 +340,7 @@
 "\"%s\"ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚\n"
 "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã« \"%s\" ã‚’å«ã‚€ã‚‚ã®ãŒ40ä»¥ä¸Šã‚ã‚Šã¾ã—ãŸã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -349,12 +349,12 @@
 "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ \"%s\" ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ã—ã‹ã—ã“ã®\n"
 "\"%s\"ã¯ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã«å«ã¾ã‚Œã¦ã„ã¾ã™:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "\"%s\" ã¯ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã¨ã‚‚èª¬æ˜Žæ–‡ã¨ã‚‚ãƒžãƒƒãƒã—ã¾ã›ã‚“ã§ã—ãŸ\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -363,7 +363,7 @@
 "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ \"%s\" ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ãã—ã¦èª¬æ˜Žæ–‡ã«ã¯\n"
 "40ä»¥ä¸Šã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã§  \"%s\" ãŒå«ã¾ã‚Œã¦ã„ã¾ã—ãŸã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -372,6 +372,11 @@
 "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ \"%s\" ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ã—ã‹ã—ã“ã®\n"
 "\"%s\" ã¯ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®èª¬æ˜Žæ–‡ã«å«ã¾ã‚Œã¦ã„ã¾ã™:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "ä¸æ£ãªã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚ãƒ£ãƒ©ã‚¯ã‚¿ '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "sensible-pager ãŒå®Ÿè¡Œã§ãã¾ã›ã‚“ã€ Debian ã‚·ã‚¹ãƒ†ãƒ ãŒå‹•ä½œã—ã¦ã„ã¾ã™ã‹?"
@@ -415,7 +420,7 @@
 msgid "Invalid operation %s"
 msgstr "ä¸æ£ãªæ“ä½œ %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -427,16 +432,16 @@
 msgstr ""
 "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰: æœ€ä½Žã§ã‚‚ä¸€ã¤ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’æŒ‡å®šã—ã¦ãã ã•ã„\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸å…¥æ‰‹å…ˆæƒ…å ±ã®ä¸€è¦§ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸å \"%s\" ã¯ç™ºè¦‹ã§ãã¾ã›ã‚“ã§ã—ãŸ"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -494,96 +499,96 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "ãªã«ãã‚Œ? ã‚‚ã¡ã‚ã‚“ã‚¦ãƒ¯ãƒãƒŸã«é£Ÿã¹ã‚‰ã‚Œã¦ã‚‹è±¡ã«æ±ºã£ã¦ã‚‹ã˜ã‚ƒã‚“ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸å…¥æ‰‹å…ˆä¸€è¦§ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "ã—ã‹ã—ã€%s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«äºˆå®šã§ã™ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "ã—ã‹ã—ã€%s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ãŠã‚Šä¿æŒã•ã‚Œã¦ã„ã¾ã™ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ã—ã‹ã— %s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "ã—ã‹ã—ãã‚Œã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ãã¾ã›ã‚“"
 
 #  FIXME: do something sensible here!
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr "ã—ã‹ã—ã€ã“ã‚Œã¯ä»®æƒ³ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã§ã™ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " ã¾ãŸã¯"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå£Šã‚Œã¦ã„ã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒä½¿ã‚ã‚Œã¦ã„ãªã„ã®ã§å‰Šé™¤ã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒè‡ªå‹•çš„ã«ä¿æŒã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "ä»¥ä¸‹ã®æ–°ã—ã„ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒè‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒè‡ªå‹•çš„ã«å‰Šé™¤ã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒä¿æŒã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "ä»¥ä¸‹ã®æ–°ã—ã„ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå‰Šé™¤ã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒæ›´æ–°ã•ã‚Œã¾ã™:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "ä»¥ä¸‹ã®å¿…é ˆãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå‰Šé™¤ã•ã‚Œã¾ã™!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã«ã‚ˆã‚Šä»¥ä¸‹ã®å¿…é ˆãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå£Šã‚Œã¾ã™:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -592,103 +597,230 @@
 "è¦å‘Š: ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚·ã‚¹ãƒ†ãƒ ã‚’å£Šã™åŽŸå› ã«ãªã‚Šã‹ãã¾ã›ã‚“ã€‚\n"
 "      ä½•ã‚’ã—ã‚ˆã†ã¨ã—ã¦ã„ã‚‹ã‹ãŒç†è§£ã—ã¦ã„ãªã„å ´åˆã¯ã€å®Ÿè¡Œã—ã¦ã¯ã„ã‘ã¾ã›ã‚“!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "I am aware that this is a very bad idea"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "ç¶šè¡Œã™ã‚‹ã«ã¯ã€'%s' ã¨ã„ã†ãƒ•ãƒ¬ãƒ¼ã‚ºã‚’ã‚¿ã‚¤ãƒ—ã—ã¦ãã ã•ã„:\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Yes"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "No"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "ç¶šè¡Œã™ã‚‹ã«ã¯ã€'%s' ã¨ã„ã†ãƒ•ãƒ¬ãƒ¼ã‚ºã‚’ã‚¿ã‚¤ãƒ—ã—ã¦ãã ã•ã„:\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒææ¡ˆã•ã‚Œã¦ã„ã¾ã™ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã›ã‚“:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒææ¡ˆã•ã‚Œã¦ã„ã¾ã™ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã›ã‚“:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "å°Žå…¥ã€å‰Šé™¤ã€æ›´æ–°ã‚’ã™ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒã‚ã‚Šã¾ã›ã‚“ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "æ›´æ–°: %lu å€‹ã€æ–°è¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«: %lu å€‹ã€"
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«: %lu å€‹ã€"
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰: %lu å€‹ã€"
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "å‰Šé™¤: %lu å€‹ã€ä¿ç•™: %lu å€‹ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "%2$sB ä¸ %1$sB ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "%sB ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "å±•é–‹å¾Œã«è¿½åŠ ã§ %sB ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒæ¶ˆè²»ã•ã‚Œã¾ã™ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "å±•é–‹å¾Œã« %sB ã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒè§£æ”¾ã•ã‚Œã¾ã™ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "ä¸æ£ãªã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚ãƒ£ãƒ©ã‚¯ã‚¿ '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "è¡¨ç¤ºã™ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒã‚ã‚Šã¾ã›ã‚“ -- 'i' ã®å¾Œã«ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã‚’å…¥åŠ›ã—ã¦ãã ã•"
 "ã„ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "ç¶šã‘ã‚‹ã«ã¯ RETURN ã‚’æŠ¼ã—ã¦ãã ã•ã„ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "è¡¨ç¤ºã™ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒã‚ã‚Šã¾ã›ã‚“ -- 'c' ã®å¾Œã«ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã‚’å…¥åŠ›ã—ã¦ãã ã•"
 "ã„ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "ç¶šã‘ã‚‹ã«ã¯ RETURN ã‚’æŠ¼ã—ã¦ãã ã•ã„ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’è¡¨ç¤ºã™ã‚‹å ´åˆã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¾ãŸã¯å‰Šé™¤"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "ä»¥ä¸‹ã®æ–°ã—ã„ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒè‡ªå‹•çš„ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¾ãŸã¯å‰Šé™¤"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "æ–°è¦ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ä¸€è¦§ã‚’æ¶ˆåŽ»"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ä¿æŒã™ã‚‹\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã«è‡ªå‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®å°ã‚’ä»˜ã‘ã‚‹\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã«æ‰‹å‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®å°ã‚’ä»˜ã‘ã‚‹\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "ã«æŽ¨å¥¨ã•ã‚Œã¦ã„ã‚‹"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "ç¶šã‘ã¾ã™ã‹ï¼Ÿ [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -699,7 +831,7 @@
 "ä¾å˜é–¢ä¿‚æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -710,7 +842,7 @@
 "ä¾å˜é–¢ä¿‚æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã›ã‚“ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -721,7 +853,7 @@
 "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -732,7 +864,7 @@
 "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’è¡¨ç¤ºã—ã¾ã›ã‚“ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -743,7 +875,7 @@
 "ã‚µã‚¤ã‚ºã®å¤‰æ›´ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -754,130 +886,105 @@
 "ã‚µã‚¤ã‚ºã®å¤‰æ›´ã‚’è¡¨ç¤ºã—ã¾ã›ã‚“ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"ã‚³ãƒžãƒ³ãƒ‰: \n"
-"  y: ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ç¶šè¡Œã—ã¾ã™\n"
-"  n: ä¸æ–ã¨çµ‚äº†\n"
-"  i: ä¸€ã¤åˆã¯è¤‡æ•°ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™\n"
-"     'i' ã®å¾Œã«ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã‚’å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚\n"
-"  c: ä¸€ã¤åˆã¯è¤‡æ•°ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸æ›´æ–°å±¥æ´ã‚’è¡¨ç¤ºã—ã¾ã™\n"
-"     'c' ã®å¾Œã«ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã‚’å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚\n"
-"  d: ãƒˆã‚°ãƒ«ã§ä¾å˜é–¢ä¿‚æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™\n"
-"  s: ãƒˆã‚°ãƒ«ã§ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚µã‚¤ã‚ºã®å¤‰æ›´ã‚’è¡¨ç¤ºã—ã¾ã™\n"
-"  v: ãƒˆã‚°ãƒ«ã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’è¡¨ç¤ºã—ã¾ã™\n"
-"  e: ã™ã¹ã¦ã®è¡¨ç¤ºã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ã‚’å…¥åŠ›ã™ã‚‹\n"
-"\n"
-"  ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®å‹•ä½œã‚’è¨å®šã§ãã¾ã™ã€‚\n"
-"  ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã®ã‚ãƒ£ãƒ©ã‚¯ã‚¿ãƒ¼ã¯ä¸€ã¤ä»¥ä¸Šã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã‹ãƒ‘ã‚¿ãƒ¼ãƒ³ã‚’æŒ‡å®šã—ã¾ã™ã€‚\n"
-"ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯ãƒžãƒƒãƒã—ãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã™ã¹ã¦ã«é©ç”¨ã•ã‚Œã¾ã™ã€‚(ãƒžãƒƒãƒã—ãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸\n"
-"ã™ã¹ã¦ã«ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚)\n"
-"\n"
-"ã‚¢ã‚¯ã‚·ãƒ§ãƒ³:\n"
-"  + : ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«\n"
-"  - : å‰Šé™¤\n"
-"  _ : å®Œå…¨å‰Šé™¤\n"
-"  = : ä¿æŒ\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "ä¸æ£ãªå¿œç”ã€‚æ£ã—ã„ã‚³ãƒžãƒ³ãƒ‰ã‚’å…¥åŠ›ã™ã‚‹ã‹ '?' ã§ãƒ˜ãƒ«ãƒ—ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "ãƒ—ãƒã‚°ãƒ©ãƒ ã®çµ‚äº†"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã«ã¯è§£æ±ºã§ããªã„ä¾å˜é–¢ä¿‚ãŒã‚ã‚Šã¾ã™:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "ä»¥ä¸‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå£Šã‚Œã¦ã„ã¾ã™:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "%s ã‚’æ›¸ãè¾¼ã¿å¯èƒ½ãªçŠ¶æ…‹ã§é–‹ã‘ã¾ã›ã‚“"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã®æ›¸ãè¾¼ã¿ã®éš›ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—ãŸ"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "ä¸æ£ãªå¿œç”ã€‚æ£ã—ã„ã‚³ãƒžãƒ³ãƒ‰ã‚’å…¥åŠ›ã™ã‚‹ã‹ '?' ã§ãƒ˜ãƒ«ãƒ—ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "ä¸æ£ãªå¿œç”ã€‚æ£ã—ã„ã‚³ãƒžãƒ³ãƒ‰ã‚’å…¥åŠ›ã™ã‚‹ã‹ '?' ã§ãƒ˜ãƒ«ãƒ—ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: å°‘ãªãã¨ã‚‚ä¸€ã¤ã®æ¤œç´¢èªžãŒå¿…è¦ã§ã™\n"
@@ -1172,7 +1279,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "å…¥æ‰‹å…ˆä¸€è¦§ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ç¶ºéº—ã«ã§ãã¾ã›ã‚“ã§ã—ãŸ"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸå¤ã„ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã—ã¦ã„ã¾ã™"
 
@@ -1456,25 +1563,20 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "ä¾å˜é–¢ä¿‚ã‚’è§£æ±ºã§ããªã„ãŸã‚ã€ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ãã¾ã›ã‚“"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "ã‚½ãƒ¼ã‚¹ã®ä¸€è¦§ãŒèªã‚ã¾ã›ã‚“"
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ä¸€è¦§ã¾ãŸã¯ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã¾ãŸã¯ãƒ‘ãƒ¼ã‚¹ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›"
 "ã‚“ã§ã—ãŸ"
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "è¦‹å½“ãŸã‚‰ãªã„ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è£œã†ãŸã‚ã«ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆã‚’æ›´æ–°ã—ã¦ãã ã•ã„"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "%s ã‚’æ›¸ãè¾¼ã¿å¯èƒ½ãªçŠ¶æ…‹ã§é–‹ã‘ã¾ã›ã‚“"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1751,17 +1853,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "'%s'ã¯ç„¡åŠ¹ãªä¸¦ã³æ›¿ãˆãƒãƒªã‚·ãƒ¼ã§ã™"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s ã¯ %s %s ã§ã‚³ãƒ³ãƒ‘ã‚¤ãƒ«ã•ã‚Œã¾ã—ãŸ \n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "ã‚³ãƒ³ãƒ‘ã‚¤ãƒ©: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1770,7 +1872,7 @@
 "\n"
 "NCurseãƒãƒ¼ã‚¸ãƒ§ãƒ³: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1779,22 +1881,22 @@
 "\n"
 "Cursesãƒãƒ¼ã‚¸ãƒ§ãƒ³: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ãƒãƒ¼ã‚¸ãƒ§ãƒ³ : %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "ä½¿ç”¨æ–¹æ³•: aptitude [-S ãƒ•ã‚¡ã‚¤ãƒ«å] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "      aptitude [ã‚ªãƒ—ã‚·ãƒ§ãƒ³]<ã‚¢ã‚¯ã‚·ãƒ§ãƒ³> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1804,117 +1906,117 @@
 "ã™):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«/æ›´æ–°\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®å‰Šé™¤\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¨è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã™ã‚‹\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ä¿æŒã™ã‚‹\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ä¿æŒã‚’è§£é™¤ã™ã‚‹\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã«è‡ªå‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®å°ã‚’ä»˜ã‘ã‚‹\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã«æ‰‹å‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®å°ã‚’ä»˜ã‘ã‚‹\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version - ç‰¹å®šãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’æ›´æ–°ç¦æ¢ã«ã™ã‚‹ã€‚\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 " update       - æ–°è¦ãŠã‚ˆã³æ›´æ–°å¯èƒ½ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ä¸€è¦§ã‚’ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - å®‰å…¨ãªæ›´æ–°ã‚’è¡Œãªã†\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr " dist-upgrade - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚„å‰Šé™¤ã‚’ä¼´ã†æ›´æ–°ã‚’è¡Œãªã†\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - \"æ–°è¦\"ã«åˆ†é¡žã•ã‚Œã¦ã„ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ä¸€è¦§æƒ…å ±ã‚’æ¶ˆåŽ» \n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’åå‰ã‚„æ£è¦è¡¨ç¾ã§æ¤œç´¢ã™ã‚‹\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - è©³ç´°ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸æƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã™ã‚‹\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - å¤ã„ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã™ã‚‹\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr "changelog     - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã® changelog ã‚’è¡¨ç¤ºã™ã‚‹\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®.debãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  ã‚ªãƒ—ã‚·ãƒ§ãƒ³: \n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h              ã“ã®æ‰‹å¼•ãã‚’è¡¨ç¤ºã™ã‚‹\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s              å®Ÿéš›ã«ã¯ä½•ã‚‚ã›ãšã€ã‚·ãƒŸãƒ¥ãƒ¬ãƒ¼ãƒˆã®ã¿è¡Œãªã†\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1922,76 +2024,76 @@
 " -d              ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã®ã¿è¡Œãªã„ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚„å‰Šé™¤ãªã©ã¯"
 "è¡Œãªã‚ãªã„\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P              å¸¸ã«ãƒ—ãƒãƒ³ãƒ—ãƒˆã§ç¢ºèªã¾ãŸã¯å®Ÿè¡Œã™ã‚‹\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y              ã™ã¹ã¦ã®yes/noã®è³ªå•ã«å¯¾ã—ã¦ 'yes' ã¨ç”ãˆãŸã¨ã¿ãªã™\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr " -F å½¢å¼        æ¤œç´¢çµæžœã®è¡¨ç¤ºãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’æŒ‡å®šï¼› ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’å‚ç…§\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr " -O é †åº        æ¤œç´¢çµæžœã®ä¸¦ã³ã‚’æŒ‡å®šï¼› ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’å‚ç…§\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w å¹…          æ¤œç´¢çµæžœã®è¡¨ç¤ºã®å¹…ã‚’æŒ‡å®šã™ã‚‹\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             ç©æ¥µçš„ã«å£Šã‚Œã¦ã„ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ä¿®å¾©ã—ã‚ˆã†ã¨ã™ã‚‹\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’è¡¨ç¤ºã™ã‚‹\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D              è‡ªå‹•çš„ã«å¤‰æ›´ã—ãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ä¾å˜é–¢ä¿‚ã‚’è¡¨ç¤ºã™ã‚‹\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚µã‚¤ã‚ºã‚’è¡¨ç¤ºã™ã‚‹\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v             è©³ç´°ãªæƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 " -t [ãƒªãƒªãƒ¼ã‚¹]  ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‹ã‚‰ãƒªãƒªãƒ¼ã‚¹ã‚’ã‚»ãƒƒãƒˆã™ã‚‹\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o key=val     ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«è¨å®šå¯èƒ½ã‚ªãƒ—ã‚·ãƒ§ãƒ³ 'key' ã‚’è¨å®šã™ã‚‹\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2000,64 +2102,64 @@
 " --with(out)-recommends\tSpecify \n"
 "                recommendãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’å¼·ã„ä¾å˜é–¢ä¿‚ã¿ãªã™ã‹è¨å®šã™ã‚‹\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S ãƒ•ã‚¡ã‚¤ãƒ«å: ãƒ•ã‚¡ã‚¤ãƒ«åã‹ã‚‰aptitudeã®è©³ç´°ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹èªã‚€\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u           : èµ·å‹•æ™‚ã«æ–°è¦ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ä¸€è¦§ã‚’ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹ \n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i           : èµ·å‹•æ™‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’è¡Œãªã†\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  aptitudeã¯ã‚¹ãƒ¼ãƒ‘ãƒ¼ç‰›ã•ã‚“ãƒ‘ãƒ¯ãƒ¼ãªã©æŒã£ã¦ã„ã¾ã›ã‚“\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o ã¯ %s ã® key=value ã®å¼•ãæ•°ãŒå¿…è¦ã§ã™"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ä¸å¯æ€è°: æœªçŸ¥ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã®ã‚³ãƒ¼ãƒ‰ã‚’å—ã‘ã¾ã—ãŸ\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "-u ã¨ -i ã¯ç‰‡æ–¹ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u ã¨ -i ã¯ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ãƒ¢ãƒ¼ãƒ‰ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã¯ã‚ã‚Šã¾ã›ã‚“(ä¾‹ã€'install'ã¨ä½¿"
 "ã†)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u ã¨ -i ã¯ã‚³ãƒžãƒ³ãƒ‰ã®æŒ‡å®šã§ã¯ã‚ã‚Šã¾ã›ã‚“"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰ \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2088,7 +2190,7 @@
 msgid "Lost"
 msgstr "æ•—åŒ—"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "ãƒžã‚¤ãƒ³ã‚¹ã‚¤ãƒ¼ãƒ‘"
 
@@ -2263,7 +2365,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸"
 
@@ -3731,53 +3833,53 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr ""
 "ãŠã£ã¨ã€äºˆæœŸã›ã¬ã‚¨ãƒ©ãƒ¼ã§ã™ã€‚ã“ã†ã„ã†ã“ã¨ã¯èµ·ãã¦æ¬²ã—ããªã‹ã£ãŸã®ã§ã™ãŒâ€¦ "
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "æ¤œç´¢: "
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "æ—¢ã« root ã§ã™!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "ã‚µãƒ–ãƒ—ãƒã‚»ã‚¹ã¯ã‚¨ãƒ©ãƒ¼ã§çµ‚äº†ã—ã¾ã—ãŸã€‚å…¥åŠ›ã—ãŸãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã¯æ£ã—ã„ã§ã™ã‹?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "ã‚ãƒ£ãƒƒã‚·ãƒ¥ã‚’èªã¿è¾¼ã‚“ã§ã„ã¾ã™"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "æœ¬å½“ã« aptitude ã‚’çµ‚äº†ã—ã¾ã™ã‹?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "å¤‰æ›´ã•ã‚ŒãŸè¨å®šã‚’ç ´æ£„ã—ã¦ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®è¨å®šã«æˆ»ã—ã¾ã™ã‹?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "åˆ©ç”¨å¯èƒ½ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’é–²è¦§ã—ã€å®Ÿè¡Œã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’é¸æŠžã—ãŸã‚Šã™ã‚‹"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3794,15 +3896,15 @@
 "ã“ã®ã‚½ãƒ•ãƒˆã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«å¾“ã£ã¦å†é…å¸ƒãŒèªã‚ã‚‰ã‚Œã¦ã„ã¾"
 "ã™ã€‚è©³ã—ãã¯'license' ã‚’è¦‹ã¦ãã ã•ã„"
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-ja.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3810,45 +3912,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "ç¶šè¡Œ"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "å°Žå…¥ã™ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ãƒ—ãƒ¬ãƒ“ãƒ¥ãƒ¼"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "å®Ÿè¡Œã•ã‚Œã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã®è¡¨ç¤ºã‚„è¨å®šã‚’è¡Œãªã†"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "å‰"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "ä¸€éƒ¨ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚ä¿®å¾©ã—ã¾ã—ãŸ"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3857,23 +3959,23 @@
 "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚‚ã—ãã¯å‰Šé™¤ã‚’è¡Œã†ã«ã¯ç®¡ç†è€…æ¨©é™ãŒå¿…è¦ã§ã™ã€‚ \n"
 "ç¾åœ¨æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“ã€‚rootã«ãªã‚Šã¾ã™ã‹ï¼Ÿ \n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "root ã«ãªã‚‹"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "root ã«ãªã‚‰ãªã„"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "ç¾åœ¨ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆã®ã‚¢ãƒƒãƒ—ãƒ‡ãƒ¼ãƒˆã€ã¾ãŸã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’å®Ÿè¡Œä¸ã§ã™ã€‚"
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "å°Žå…¥ã€å‰Šé™¤ã€æ›´æ–°ã‚’ã™ã‚‹äºˆå®šã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒã‚ã‚Šã¾ã›ã‚“ã€‚"
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3885,7 +3987,7 @@
 "å¹¾ã¤ã‹ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯æ›´æ–°å¯èƒ½ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ãŒã€æ›´æ–°ã‚’é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚\n"
 "\"U\"ã¨æ‰“ã£ã¦æ›´æ–°ã®æº–å‚™ã‚’ã—ã¦ãã ã•ã„ã€‚"
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3894,99 +3996,112 @@
 "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆã®æ›´æ–°ã«ã¯ç®¡ç†è€…æ¨©é™ãŒå¿…è¦ã§ã™ã€‚ \n"
 "ç¾åœ¨æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“ã€‚root ã«ãªã‚Šã¾ã™ã‹ï¼Ÿ \n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "åœ°é›·æŽ¢ã—ã«æŒ‘æˆ¦ã—ã¦æ™‚é–“ã¤ã¶ã—"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸ã®å‰Šé™¤ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã—ã¦ã„ã¾ã™"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å‰Šé™¤ã•ã‚Œã¦ã„ã¾ã™"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸå¤ã„ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯å‰Šé™¤ã•ã‚Œã¾ã—ãŸ"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "åœ°é›·æŽ¢ã—ã«æŒ‘æˆ¦ã—ã¦æ™‚é–“ã¤ã¶ã—"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "%s ã‚’æ›¸ãè¾¼ã¿å¯èƒ½ãªçŠ¶æ…‹ã§é–‹ã‘ã¾ã›ã‚“"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¾ãŸã¯å‰Šé™¤"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "é¸æŠžã•ã‚Œã¦ã„ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®å°Žå…¥ã‚„å‰Šé™¤"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ãƒªã‚¹ãƒˆã‚’æ›´æ–°ã™ã‚‹"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ç¢ºèªã™ã‚‹"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "æ–°è¦ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ä¸€è¦§ã‚’æ¶ˆåŽ»"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "ã©ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒ \"æ–°è¦\"ã‹ã‚’æ¶ˆåŽ»"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚ãƒ£ãƒƒã‚·ãƒ¥ã‚’æ¶ˆåŽ»"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã™ã‚‹"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "ä½¿ã‚ã‚Œã¦ã„ãªã„ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¶ˆã™"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "ã‚‚ã†ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ããªã„ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã™ã‚‹"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "æ›´æ–°å¯èƒ½ãªã‚‚ã®ã‚’ãƒžãƒ¼ã‚¯ã™ã‚‹"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "æ›´æ–°ç”¨ã«ãƒžãƒ¼ã‚¯ã•ã‚Œã¦ã„ãªã„æ›´æ–°å¯èƒ½ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã™ã¹ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "ãƒžã‚¤ãƒ³ã‚¹ã‚¤ãƒ¼ãƒ‘ã§éŠã¶"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "root ã«ãªã‚‹"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3995,79 +4110,79 @@
 "su ã‚’å®Ÿè¡Œã—ã¦ root ã«ãªã‚Šã€ãƒ—ãƒã‚°ãƒ©ãƒ ã‚’å†èµ·å‹•ã—ã¾ã™ã€‚\n"
 "ãã®éš›ã€ç¾åœ¨ã®è¨å®šã¯ä¿æŒã•ã‚Œã¾ã™ã€‚"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚ãƒ£ãƒƒã‚·ãƒ¥ã®å†èªã¿è¾¼ã¿"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚ãƒ£ãƒƒã‚·ãƒ¥ã‚’å†åº¦èªã¿è¾¼ã‚€"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "çµ‚äº†"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "ãƒ—ãƒã‚°ãƒ©ãƒ ã®çµ‚äº†"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "æˆ»ã‚‹"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "æœ€å¾Œã«è¡Œãªã£ãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ç®¡ç†æ“ä½œã‚’æˆ»ã™"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‹ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã™ã‚‹ã‚ˆã†é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "å‰Šé™¤"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "å‰Šé™¤ã•ã‚Œã‚‹ã‚ˆã†é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "å®Œå…¨å‰Šé™¤"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åŠã³è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã™ã‚‹ã‚ˆã†é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "ä¿æŒ"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãŒå–ã‚Šæ¶ˆã•ã‚Œã‚‹"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "ç¶æŒ"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãŒå–ã‚Šæ¶ˆã•ã‚Œã€ä»Šå¾Œã‚‚ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã‚‚ é˜²ãŒã‚Œã‚‹"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "è‡ªå‹•ãƒžãƒ¼ã‚¯"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4076,11 +4191,11 @@
 "é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã«è‡ªå‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸå°ã‚’ä»˜ã‘ã‚‹;\n"
 "ä¾å˜ã—ã¦ã„ãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒãªããªã‚‹ã¨ã¨è‡ªå‹•çš„å‰Šé™¤ã•ã‚Œã‚‹ã ã‚ã†"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "æ‰‹å‹•ãƒžãƒ¼ã‚¯"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4089,11 +4204,11 @@
 "é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã«æ‰‹å‹•ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸå°ã‚’ä»˜ã‘ã‚‹;\n"
 "æ‰‹å‹•ã§å‰Šé™¤ã•ã‚Œãªã„é™ã‚Šå‰Šé™¤ã•ã‚Œãªã„ã ã‚ã†"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "ç¦æ¢ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4102,215 +4217,215 @@
 "é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®å€™è£œãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚‹ã®ã‚’ç¦æ¢ã™ã‚‹;\n"
 "é€šå¸¸ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã‚‚ã®ã‚ˆã‚Šæ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã§ã™"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "æƒ…å ±"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®ã‚ˆã‚Šè©³ã—ã„æƒ…å ±ãŒè¡¨ç¤ºã•ã‚Œã‚‹"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "å¤‰æ›´å±¥æ´"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "é¸æŠžã•ã‚ŒãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®æ›´æ–°å±¥æ´ãŒè¡¨ç¤ºã•ã‚Œã‚‹"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "æ¤œç´¢"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’æ¤œç´¢ã™ã‚‹"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "å†æ¤œç´¢"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "æœ€å¾Œã«è¡Œãªã£ãŸæ¤œç´¢ã‚’ç¹°ã‚Šæ›ãˆã™"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "è¡¨ç¤ºåˆ¶é™"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆã‚’ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°ã™ã‚‹"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "è¡¨ç¤ºåˆ¶é™è§£é™¤"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’å‰Šé™¤ã™ã‚‹"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "å£Šã‚Œã¦ã„ã‚‹ã‚‚ã®ã‚’æŽ¢ã™"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "è§£æ±ºã§ããªã„ä¾å˜é–¢ä¿‚ãŒã‚ã‚‹ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’æŽ¢ã™"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "UIã‚ªãƒ—ã‚·ãƒ§ãƒ³"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "ãƒ¦ãƒ¼ã‚¶ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã«å½±éŸ¿ã™ã‚‹è¨å®šã‚’å¤‰æ›´ã™ã‚‹ã€‚"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "ä¾å˜é–¢ä¿‚ã®å‡¦ç†"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ä¾å˜é–¢ä¿‚ã®å‡¦ç†ã«é–¢ã™ã‚‹è¨å®šã‚’å¤‰æ›´"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "ãã®ä»–"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "ãã®ä»–ã®è¨å®šã®å¤‰æ›´"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’å…ƒã«æˆ»ã™"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "ã™ã¹ã¦ã®è¨å®šã‚’ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®è¨å®šã«æˆ»ã™"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "æ¬¡"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "æ¬¡ã®ç”»é¢ã‚’è¡¨ç¤º"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "å‰"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "å‰ã®ç”»é¢ã‚’è¡¨ç¤º"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "é–‰ã˜ã‚‹"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "ã“ã®ç”»é¢ã‚’é–‰ã˜ã‚‹"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "æ–°ã—ã„ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ç”»é¢"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "æ–°è¦ã«æ¨™æº–ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ç”»é¢ã‚’ä½œæˆ"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "æ–°ã—ã„ã‚«ãƒ†ã‚´ãƒªãƒ¼ã§è¡¨ç¤º"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’è©³ã—ãåˆ†é¡žã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«ã¤ã„ã¦"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«ã¤ã„ã¦ã®èª¬æ˜Ž"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "ãƒ˜ãƒ«ãƒ—"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ãƒ˜ãƒ«ãƒ—ã‚’è¡¨ç¤ºã—ã¾ã™"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "ãƒ¦ãƒ¼ã‚¶ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "è©³ç´°ãªãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’è¡¨ç¤ºã—ã¾ã™"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "é »ç¹ã«è³ªå•ã•ã‚Œã‚‹äº‹ã‚’è¡¨ç¤ºã—ã¾ã™"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "ãƒ—ãƒã‚°ãƒ©ãƒ ã®é‡è¦ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³ã”ã¨ã®å¤‰æ›´ç‚¹ã‚’è¡¨ç¤ºã—ã¾ã™"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "ãƒ©ã‚¤ã‚»ãƒ³ã‚¹"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "ãƒ—ãƒã‚°ãƒ©ãƒ ã‚’å†é…å¸ƒã™ã‚‹éš›ãªã©ã®æ¡ä»¶ã‚’è¡¨ç¤º"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "ã‚¢ã‚¯ã‚·ãƒ§ãƒ³"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "æ¤œç´¢"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "ã‚ªãƒ—ã‚·ãƒ§ãƒ³"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "è¡¨ç¤º"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "ãƒ˜ãƒ«ãƒ—"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: ãƒ¡ãƒ‹ãƒ¥ãƒ¼  %s: ãƒ˜ãƒ«ãƒ—  %s: çµ‚äº†  %s: æ›´æ–°  %s: ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã® å–å¾—/å°Žå…¥/å‰Šé™¤"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes keu"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no key"
 
@@ -4352,13 +4467,56 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "ã‚ãŒ! SIGQUITã‚’å—ã‘ã¾ã—ãŸã€æ»äº¡â€¦\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Yes"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "No"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "ã‚³ãƒžãƒ³ãƒ‰: \n"
+#~ "  y: ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ç¶šè¡Œã—ã¾ã™\n"
+#~ "  n: ä¸æ–ã¨çµ‚äº†\n"
+#~ "  i: ä¸€ã¤åˆã¯è¤‡æ•°ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™\n"
+#~ "     'i' ã®å¾Œã«ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã‚’å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚\n"
+#~ "  c: ä¸€ã¤åˆã¯è¤‡æ•°ã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸æ›´æ–°å±¥æ´ã‚’è¡¨ç¤ºã—ã¾ã™\n"
+#~ "     'c' ã®å¾Œã«ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã‚’å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚\n"
+#~ "  d: ãƒˆã‚°ãƒ«ã§ä¾å˜é–¢ä¿‚æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™\n"
+#~ "  s: ãƒˆã‚°ãƒ«ã§ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚µã‚¤ã‚ºã®å¤‰æ›´ã‚’è¡¨ç¤ºã—ã¾ã™\n"
+#~ "  v: ãƒˆã‚°ãƒ«ã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’è¡¨ç¤ºã—ã¾ã™\n"
+#~ "  e: ã™ã¹ã¦ã®è¡¨ç¤ºã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ã‚’å…¥åŠ›ã™ã‚‹\n"
+#~ "\n"
+#~ "  ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã®å‹•ä½œã‚’è¨å®šã§ãã¾ã™ã€‚\n"
+#~ "  ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã®ã‚ãƒ£ãƒ©ã‚¯ã‚¿ãƒ¼ã¯ä¸€ã¤ä»¥ä¸Šã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸åã‹ãƒ‘ã‚¿ãƒ¼ãƒ³ã‚’æŒ‡å®šã—ã¾"
+#~ "ã™ã€‚\n"
+#~ "ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯ãƒžãƒƒãƒã—ãŸãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã™ã¹ã¦ã«é©ç”¨ã•ã‚Œã¾ã™ã€‚(ãƒžãƒƒãƒã—ãŸãƒ‘ãƒƒã‚±ãƒ¼"
+#~ "ã‚¸\n"
+#~ "ã™ã¹ã¦ã«ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚)\n"
+#~ "\n"
+#~ "ã‚¢ã‚¯ã‚·ãƒ§ãƒ³:\n"
+#~ "  + : ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«\n"
+#~ "  - : å‰Šé™¤\n"
+#~ "  _ : å®Œå…¨å‰Šé™¤\n"
+#~ "  = : ä¿æŒ\n"
 
 #  Use apt-get's familiar error message,
 #~ msgid ""

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	Sun May  1 17:18:21 2005
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_0.2.15.8-1_lt\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-11-06 23:37+0200\n"
 "Last-Translator: Darius Å½itkevicius <skystis at splius.lt>\n"
 "Language-Team: Lithuankian <komp_lt at konferencijos.lt>\n"
@@ -156,7 +156,7 @@
 msgstr "AutomatiÅ¡kai paÅ¡alinti nebenaudojamus paketus pagal filtrÄ…"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Gerai"
@@ -299,47 +299,47 @@
 "DÄ—mesio: parenkant â€ž%sâ€œ, o ne\n"
 "      virtualÅ³ paketÄ… â€ž%sâ€œ\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "tinkama paketo %s versija (%s) jau Ä¯diegta\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s Å¡iuo metu nÄ—ra Ä¯diegtas, todÄ—l negali bÅ«ti Ä¯diegtas iÅ¡ naujo.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Paketas %s nÄ—ra Ä¯diegtas, todÄ—l negali bÅ«ti paÅ¡alintas\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Paketas %s nÄ—ra Ä¯diegtas, todÄ—l negaliu uÅ¾drausti jo atnaujinimo\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Paketas %s neatnaujinamas, todÄ—l negaliu uÅ¾drausti jo atnaujinimo\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "DÄ—mesio: parenku uÅ¾duotÄ¯ â€ž%s: %sâ€œ diegimui\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Naudojant komandÄ… â€žinstallâ€œ galima nurodyti tik paketo versijÄ…\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Naudojant komandÄ… â€žinstallâ€œ galima nurodyti tik paketo archyvÄ…\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -348,7 +348,7 @@
 "Negaliu rasti paketo â€ž%sâ€œ, daugiau nei 40\n"
 "paketÅ³ pavadinime turi frazÄ™ â€ž%sâ€œ.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -357,14 +357,14 @@
 "Negaliu rasti paketo â€ž%sâ€œ.  TaÄiau Å¡ie \n"
 "paketai pavadinime turi frazÄ™ â€ž%sâ€œ.\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Negaliu rasti nei vieno paketo, kurio pavadinime arba apraÅ¡e bÅ«tÅ³ frazÄ— â€ž%"
 "sâ€œ\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -373,7 +373,7 @@
 "Negaliu rasti paketo su fraze â€ž%sâ€œ, ir yra daugiau nei 40\n"
 "paketÅ³ kuriÅ³ apraÅ¡e yra frazÄ— â€ž%sâ€œ.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -382,6 +382,11 @@
 "Negaliu rasti paketo su fraze â€ž%sâ€œ. TaÄiau Å¡ie\n"
 "paketai savo apraÅ¡e turi frazÄ™ â€ž%sâ€œ.\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Netinkamas veiksmo simbolis â€ž%câ€œ\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Negaliu paleisti puslapiuotojo, ar tai veikianti Debian sistema?"
@@ -422,7 +427,7 @@
 msgid "Invalid operation %s"
 msgstr "Klaidingas veiksmas %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -433,16 +438,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "atsisiuntimas: reikia nurodyti bent vienÄ… paketÄ… atsisiuntimui\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Negaliu nuskaityti Å¡altiniÅ³ sÄ…raÅ¡o"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Nerandu paketo, kurio pavadinimas â€ž%sâ€œ"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -497,96 +502,96 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Kas tai?  Tai dramblys, kurÄ¯ suvalgÄ— gyvatÄ—, Å¾inoma.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Negaliu nuskaityti Å¡altiniÅ³ sÄ…raÅ¡o"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "taÄiau %s bus Ä¯diegtas"
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "taÄiau %s Ä¯diegtas ir jo atnaujinimas sulaikomas"
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "taÄiau %s yra Ä¯diegtas."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "taÄiau jis negali bÅ«ti Ä¯diegtas"
 
 #  FIXME: do something sensible here!
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " kuris yra virtualus paketas."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " arba"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Å ie paketai yra SUGADINTI:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Å ie paketai nebenaudojami, todÄ—l dabar bus PAÅ ALINTI:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Å iÅ³ paketÅ³ atnaujinimas automatiÅ¡kai sulaikomas:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Å ie NAUJI paketai bus Ä¯diegti automatiÅ¡kai:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Å ie paketai bus PAÅ ALINTI automatiÅ¡kai:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Å ie paketai bus PASENDINTI (Ä¯diegtos jÅ³ senesnÄ—s versijos):"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Å iÅ³ paketÅ³ atnaujinimas sulaikomas:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Å ie paketai bus Ä¯diegti iÅ¡ naujo (PERINSTALIUOTI):"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Bus Ä¯diegti Å¡ie NAUJI paketai:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Å ie paketai bus PAÅ ALINTI:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Å ie paketai bus atnaujinti:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Å ie ESMINIAI paketai bus PAÅ ALINTI!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "JÅ«sÅ³ veiksmai Å¡iuos ESMINIUS paketus SUGADINS:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -595,100 +600,231 @@
 "DÄ–MESIO: Å ie JÅ«sÅ³ veiksmai greiÄiausiai sugadins JÅ«sÅ³ sistemÄ…!\n"
 "         SUSTOKITE dabar, nebent jÅ«s TIKSLIAI Å¾inote kÄ… darote!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "AÅ¡ sunerimÄ™s, nes manau kad tai tikrai bloga mintis"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "NorÄ—dami tÄ™sti paraÅ¡ykite frazÄ™ â€ž%sâ€œ:\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Taip"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Ne"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "NorÄ—dami tÄ™sti paraÅ¡ykite frazÄ™ â€ž%sâ€œ:\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Å ie paketai yra SIÅªLOMI, taÄiau jie nebus Ä¯diegti:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Å ie paketai yra SIÅªLOMI, taÄiau jie nebus Ä¯diegti:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nei vienas paketas nebus Ä¯diegtas, paÅ¡alintas arba atnaujintas.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paketÅ³ atnaujinta, %lu naujÅ³ paketÅ³ Ä¯diegta, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu Ä¯diegta iÅ¡ naujo, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu pasendinta, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu bus paÅ¡alinta ir %lu ne atnaujinta.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Reikia gauti %sB/%sB archyvÅ³. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Reikia gauti %sB archyvÅ³. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Po archyvÅ³ iÅ¡pakavimo bus panaudota %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Po archyvÅ³ iÅ¡pakavimo bus atlaisvinta %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Netinkamas veiksmo simbolis â€ž%câ€œ\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "NÄ—ra rodomÅ³ paketÅ³ -- Ä¯veskite paketÅ³ vardus eilutÄ—je po â€žiâ€œ.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Kad tÄ™sti spauskite ENTER."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nerastas joks paketas -- Ä¯veskite paketÅ³ pavadinimus eilutÄ—je po â€žcâ€œ.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Kad tÄ™sti spauskite ENTER."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "PaketÅ³ perÅ¾iÅ«ros ekrano formatas"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Diegti/Å¡alinti paketus"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Å ie NAUJI paketai bus Ä¯diegti automatiÅ¡kai:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Diegti/Å¡alinti paketus"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^PamirÅ¡ti naujus paketus"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Sulaikyti paketÅ³ atnaujinimÄ…\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+" markauto     - PaÅ¾ymÄ—ti paketus taip, kad atrodytu jog jie Ä¯diegti "
+"automatiÅ¡kai\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+" unmarkauto   - PaÅ¾ymÄ—ti paketus taip, kad atrodytu jog jie Ä¯diegti rankiniu "
+"bÅ«du\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "rekomenduoja"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Ar tÄ™sti? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -699,7 +835,7 @@
 "Bus rodoma priklausomybiÅ³ informacija.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -710,7 +846,7 @@
 "PriklausomybiÅ³ informacija nebus rodoma.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -721,7 +857,7 @@
 "Bus rodomos versijos.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -732,7 +868,7 @@
 "Versijos nebus rodomos.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -743,7 +879,7 @@
 "Bus rodomi dydÅ¾io pakeitimai.\n"
 " \n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -754,129 +890,102 @@
 "DydÅ¾io pakeitimai nebus rodomi.\n"
 " \n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Komandos:\n"
-"  y: tÄ™sti diegimÄ…\n"
-"  n: atÅ¡aukti ir iÅ¡eiti\n"
-"  i: rodyti informacijÄ… apie vienÄ… ar kelis paketus\n"
-"     paketÅ³ vardai turi bÅ«ti po â€žiâ€œ.\n"
-"  c: rodyti vieno ar keliÅ³ paketÅ³ Debian pakeitimÅ³ sÄ…raÅ¡Ä… (changelog);\n"
-"      paketÅ³ sÄ…raÅ¡as turi bÅ«ti po â€žcâ€œ\n"
-"  d: perjungti priklausomybiÅ³ vaizdavimÄ…\n"
-"  s: perjungti paketÅ³ dydÅ¾iÅ³ pasikeitimÅ³ vaizdavimÄ…\n"
-"  v: perjungti versijÅ³ vaizdavimÄ…\n"
-"  e: pereiti Ä¯ pilnÄ… vizualiÄ… aplinkÄ…\n"
-"\n"
-"  Taip pat JÅ«s galite nurodyti pakeitimus grupei paketÅ³.\n"
-"  NorÄ—dami tai padaryti Ä¯raÅ¡ykite veiksmo simbolÄ¯ ir vienÄ… ar kelis\n"
-"paketÅ³ pavadinimus po jo. Taip pat galite naudoti Å¡ablonus (patterns).\n"
-"Veiksmas bus pritaikytas visiems paketams (galima nurodyti papildomus\n"
-"veiksmus, visi jie bus pritaikyti visiems paketams, iÅ¡vardintiems po \n"
-"veiksmo simbolio)\n"
-"\n"
-"Veiksmai:\n"
-"  + : Ä®diegti\n"
-"  - : PaÅ¡alinti\n"
-"  _ : IÅ¡valyti\n"
-"  = : sulaikyti\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Neteisinga komanda.  Ä®veskite teisingÄ… komandÄ…, arba spauskite â€ž?â€œ.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "IÅ¡eiti iÅ¡ programos"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Å iÅ³ paketÅ³ priklausomybÄ—s netenkinamos:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Å ie paketai yra SUGADINTI:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Klaida raÅ¡ant bÅ«senos bylÄ…"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Neteisinga komanda.  Ä®veskite teisingÄ… komandÄ…, arba spauskite â€ž?â€œ.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Neteisinga komanda.  Ä®veskite teisingÄ… komandÄ…, arba spauskite â€ž?â€œ.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1175,7 +1284,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "Negaliu iÅ¡valyti katalogÅ³ sÄ…raÅ¡o"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Trinamos pasenusios gautos bylos"
 
@@ -1462,24 +1571,19 @@
 "NeÄ¯manoma iÅ¡sprÄ™sti priklausomybiÅ³ problemas, kai kurie paketai negali bÅ«ti "
 "Ä¯diegti"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Nepavyko perskaityti Å¡altiniÅ³ sÄ…raÅ¡o."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "PaketÅ³ sÄ…raÅ¡as arba bÅ«senos byla negali bÅ«ti interpretuotas arba atidarytas."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "TrÅ«ksta bylÅ³, tikriausiai reikia atnaujinti paketÅ³ sÄ…raÅ¡Ä…"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Negaliu atidaryti %s raÅ¡ymui"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1754,17 +1858,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Netinkamas rÅ«Å¡iavimo taisykliÅ³ tipas â€ž%sâ€œ"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompiliuotas %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompiliatorius: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1773,7 +1877,7 @@
 "\n"
 "NCurses versija: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1782,22 +1886,22 @@
 "\n"
 "Curses versija: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ versija: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Naudojimas: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [parametrai] <veiksmas> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1806,63 +1910,63 @@
 "  Veiksmai (jei nenurodyti jokie parametrai, aptitude veiks interaktyviai):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Ä®diegti/atnaujinti paketus\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - PaÅ¡alinti paketus\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - PaÅ¡alinti paketus ir jÅ³ nustatymÅ³ bylas\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Sulaikyti paketÅ³ atnaujinimÄ…\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - AtÅ¡aukti paketÅ³ sulaikymÄ…\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 " markauto     - PaÅ¾ymÄ—ti paketus taip, kad atrodytu jog jie Ä¯diegti "
 "automatiÅ¡kai\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 " unmarkauto   - PaÅ¾ymÄ—ti paketus taip, kad atrodytu jog jie Ä¯diegti rankiniu "
 "bÅ«du\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version - UÅ¾drausti atnaujinimÄ… Ä¯ nurodytÄ… versijÄ….\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - AtsisiÅ³sti naujÄ… paketÅ³ sÄ…raÅ¡Ä…\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Saugiai atnaujinti\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1871,57 +1975,57 @@
 " dist-upgrade - Atnaujinti ir leisti paÅ¡alinti nereikalingus ir Ä¯diegti "
 "naujus paketus\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - UÅ¾mirÅ¡ti kurie paketai yra â€žnaujiâ€œ\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Paketo paieÅ¡ka pagal pavadinimÄ… ir/arba iÅ¡raiÅ¡kÄ…\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Rodyti smulkiÄ… paketo informacijÄ…\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - PaÅ¡alinti gautÅ³ paketÅ³ bylas\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - PaÅ¡alinti senus atsisiÅ³stus paketus\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Å½iÅ«rÄ—ti paketo pakeitimÅ³ sÄ…raÅ¡Ä…\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Gauti paketÄ…\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Parametrai:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Å i pagalbos informacija\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simuliuoti veiksmus, taÄiau nieko realaus nevykdyti.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1929,18 +2033,18 @@
 " -d             Tik atsisiÅ³sti reikalingus paketus nieko nediegti ir "
 "neÅ¡alinti.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Visada klausti veiksmÅ³ patvirtinimo\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             Ä® klausimus taip/ne automatiÅ¡kai atsakyti â€žtaipâ€œ\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1949,7 +2053,7 @@
 " -F formatas      Nurodyti kokiÅ³ formatu rodyti paieÅ¡kos rezultatus Å¾r. "
 "instrukcijÄ…\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1957,34 +2061,34 @@
 " -O tvarka       Nurodyti kaip rÅ«Å¡iuoti paieÅ¡kos rezultatus; Å¾r. "
 "instrukcijoje\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w plotis       Nuodyti ekrano plotÄ¯, paieÅ¡kos rezultatÅ³ formavimui\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Bandyti tvarkyti sugadintus paketus agresyviai.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Rodyti kurios paketÅ³ versijos bus Ä¯diegtos.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Rodyti automatiÅ¡kai pakeistÅ³ paketÅ³ priklausomybes.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Rodyti Ä¯diegtÅ³ paketÅ³ dydÅ¾io pasikeitimus.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -1992,18 +2096,18 @@
 " -v             Rodyti papildomÄ… informacijÄ….( gali bÅ«ti naudojamas kelis "
 "kartus)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [release]   Nustatyti kuri versija turi bÅ«ti Ä¯diegta.\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o raktas=reikÅ¡mÄ—      Tiesiogiai siÅ³sti nustatymÄ… â€žraktasâ€œ\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2013,64 +2117,64 @@
 "paketus\n"
 "                kaip reikalingus\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname: Skaityti aptitude iÅ¡plÄ—stinÄ—s bÅ«senos informacijÄ… iÅ¡ bylos "
 "fname.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : SiÅ³stis naujÄ… paketÅ³ sÄ…raÅ¡Ä… tik paleidus programÄ….\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Paleidus programÄ… automatiÅ¡kai vykdyti diegimÄ….\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  aptitude neturi SuperkarvÄ—s galiÅ³.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "  o reikalauja argumentÅ³ formate â€žraktas=reikÅ¡mÄ—â€œ, gavau %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "KEISTA: gautas neÅ¾inomas kodas\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Gali bÅ«ti nurodytas tik vienas iÅ¡ -u ir -i\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "-u ir -i nenaudojami komandinÄ—s eilutÄ—s reÅ¾ime(pvz., su â€žinstallâ€œ)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u ir -i negali bÅ«ti nurodyti su komanda"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "NeÅ¾inoma komanda â€ž%sâ€œ\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2101,7 +2205,7 @@
 msgid "Lost"
 msgstr "PraloÅ¡Ä—t"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "MinÅ³ laukas"
 
@@ -2277,7 +2381,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paketas"
 
@@ -3728,54 +3832,54 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Brrr, Äia nÄ—ra jokiÅ³ klaidÅ³, tai neturÄ—jo Ä¯vykti.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "IeÅ¡koti: "
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "JÅ«s jau turite root teises!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Ä®vyko klaida -- ar JÅ«s teisingai Ä¯raÅ¡Ä—te slaptaÅ¾odÄ¯?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Paimu duomenis"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Tikrai iÅ¡einate iÅ¡ Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "JÅ«s tikrai norite prarasti savo asmeninius nustatymus ir Ä¯kelti "
 "standartinius?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Paketai"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "PerÅ¾iÅ«rÄ—ti turimus paketus ir atlikti veiksmus"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3792,15 +3896,15 @@
 "jÅ«s galite jÄ… platinti pagal tam tikras sÄ…lygas;\n"
 "norÄ—dami suÅ¾inoti daugiau Å¾iÅ«rÄ—kite â€žlicencijaâ€œ."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3808,45 +3912,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "TÄ™sti"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "PerÅ¾iÅ«rÄ—ti paketo diegimÄ…"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Atgal"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Kai kurie paketai buvo sugadinti ir aÅ¡ juos sutvarkiau"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3855,23 +3959,23 @@
 "NorÄ—dami Ä¯diegti/paÅ¡alinti paketus turite turÄ—ti administratoriaus (root)\n"
 "privilegijas, kuriÅ³ jÅ«s neturite.  Ar norite pereiti Ä¯ â€žrootâ€œ paskyrÄ…?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Tapti â€žrootâ€œ"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Netapti â€žrootâ€œ"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "PaketÅ³ atnaujinimas arba diegimas jau vyksta."
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Jokio paketo Ä¯diegimas, paÅ¡alinimas ar atnaujinimas neplanuojamas."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3884,7 +3988,7 @@
 "atnaujinti.\n"
 "Spauskite â€žUâ€œ kad paruoÅ¡ti atnaujinimÄ…."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3893,100 +3997,113 @@
 "Norint atnaujinti paketÅ³ sÄ…raÅ¡Ä… JÅ«s turite turÄ—tu root teises., kuriÅ³\n"
 "jÅ«s neturite. Ar norite jas Ä¯gyti?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Trinu gautus paketus"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Gauti paketai iÅ¡trinti"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "PasenÄ™ gauti paketai iÅ¡trinti"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "GaiÅ¡tate laikÄ… bandydami rasti minas"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Negaliu atidaryti %s raÅ¡ymui"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Diegti/Å¡alinti paketus"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Vykdyti numatytus veiksmus"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Atnaujinti paketÅ³ sÄ…raÅ¡Ä…"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "IeÅ¡koti naujÅ³ paketÅ³ versijÅ³"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^PamirÅ¡ti naujus paketus"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "PamirÅ¡ti kurie paketai yra â€žnaujiâ€œ"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^Valyti paketÅ³ talpyklÄ…"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "IÅ¡trinti paketus, kurie buvo atsiÅ³sti anksÄiau"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "^IÅ¡valyti pasenusius paketus"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "PaÅ¡alinti paketus, kuriÅ³ nebeÄ¯manoma gauti"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "PaÅ¾ymÄ—ti ^kaip atnaujinamÄ…"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "Å½aisti ^MinÅ³ laukÄ…"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Tapti â€žrootâ€œ"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3995,68 +4112,68 @@
 "Paleiskite komandÄ… â€žsuâ€œ, kad taptumÄ—te root.  Programa startuos\n"
 "iÅ¡ naujo, bet visi jÅ«sÅ³ nustatymai iÅ¡liks."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Perdaryti paketÅ³ bylas"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Perkrauti paketÅ³ talpyklÄ…"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Baigti"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "IÅ¡eiti iÅ¡ programos"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "AtÅ¡aukti"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "AtÅ¡aukti paskutinÄ¯ veiksmÄ…, arba operacijÅ³ grupÄ™."
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "Ä®d^iegti"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "PaÅ¾ymÄ—ti dabartinÄ¯ paketÄ… diegti arba atnaujinti"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^PaÅ¡alinti"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "PaÅ¾ymÄ—ti Å¡Ä¯ paketÄ…, kaip Å¡alinamÄ…"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "iÅ¡^naikinti"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Palikti"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "AtÅ¡aukti Å¡iam paketui visus veiksmus"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Sulaikyti"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4064,11 +4181,11 @@
 "AtÅ¡aukti Å¡iam paketui visus veiksmus, ir apsaugoti jÄ¯ nuo ateities "
 "atnaujinimÅ³"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "PaÅ¾ymÄ—ti ^Auto"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4077,11 +4194,11 @@
 "PaÅ¾ymÄ—ti paÅ¾ymÄ—tus paketus kaip Ä¯diegtus automatiÅ¡kai;\n"
 "tuomet jie bus automatiÅ¡kai paÅ¡alinti, kai jÅ³ nebereikÄ—s kitiems paketams"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Å½ymÄ—ti ^Ne automatinis"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4090,11 +4207,11 @@
 "PaÅ¾ymÄ—ti pasirinktus paketus, kaip Ä¯diegtus rankiniu bÅ«du;\n"
 "jie nebus paÅ¡alinti tol, kol to nepadarysite rankiniu bÅ«du"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^UÅ¾draustos Versijos"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4103,217 +4220,217 @@
 "UÅ¾drausti paÅ¾ymÄ—to paketo Å¡iÄ… versijÄ…;\n"
 "naujesnÄ—s paketo versijos bus Ä¯diegtos kaip Ä¯prasta"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^informacija"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Parodyti daugiau informacijos apie paÅ¾ymÄ—tÄ… paketÄ…"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "PakeitimÅ³ ^sÄ…raÅ¡as"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Rodyti Å¡io paketo Debian pakeitimÅ³ sÄ…raÅ¡Ä… (Changelog)"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Rasti"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "IeÅ¡koti paketo: "
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Rasti ^VÄ—l"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Pakartoti paieÅ¡kÄ…"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Apriboti ekranÄ…"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Pritaikyti filtrÄ… paketÅ³ sÄ…raÅ¡ui"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Neberiboti ekrano"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Nebenaudoti"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Rasti ^BlogÄ…"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Rasti sekantÄ¯ blogÄ… paketÄ…"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^Aplinkos nustatymai"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Pakeisti nustatymus, susijusius su naudotojo aplinka"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^PriklausomybiÅ³ tvarkymas"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Kitkas"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Keisti kitas Aptitude nustatymus"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "Atstatyti ^nustatymus"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Atstatyti sistemos pradinius nustatymus"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Sekantis"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Pereiti Ä¯ sekantÄ¯ ekranÄ…"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Atgal"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Pereiti Ä¯ ankstesnÄ¯ ekranÄ…"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^UÅ¾daryti"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "UÅ¾daryti Å¡Ä¯ ekranÄ…"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Sekantis paketÅ³ ^vaizdas"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Sukurti naujÄ… standartinÄ¯ paketÅ³ rodymÄ…"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "^Nauja kategorijÅ³ narÅ¡yklÄ—"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "NarÅ¡yti paketus pagal kategorijas"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Apie"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Rodyti informacijÄ… apie Å¡iÄ… programÄ…"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Pagalba"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Rodyti pagalbÄ…"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "Naudotojo ^instrukcijos"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Rodyti detalizuotas naudotojo instrukcijas"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^DUK"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Rodyti daÅ¾niausiai uÅ¾duodamus klausimus"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr ""
 "Rodyti svarbiausius pakeitimus, kurie atsirado kiekvienoje programos "
 "versijoje"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licencija"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Veiksmai"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "PaieÅ¡ka"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Nuostatos"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Rodymas"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Pagalba"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Meniu  %s: Pagalba  %s: Baigti  %s: Atnaujinti  %s: Pritaikyti pakeitimus"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "t"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
@@ -4355,13 +4472,56 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Oi!  Gavau SIGQUIT, mirÅ¡tu...\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Taip"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Ne"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Komandos:\n"
+#~ "  y: tÄ™sti diegimÄ…\n"
+#~ "  n: atÅ¡aukti ir iÅ¡eiti\n"
+#~ "  i: rodyti informacijÄ… apie vienÄ… ar kelis paketus\n"
+#~ "     paketÅ³ vardai turi bÅ«ti po â€žiâ€œ.\n"
+#~ "  c: rodyti vieno ar keliÅ³ paketÅ³ Debian pakeitimÅ³ sÄ…raÅ¡Ä… (changelog);\n"
+#~ "      paketÅ³ sÄ…raÅ¡as turi bÅ«ti po â€žcâ€œ\n"
+#~ "  d: perjungti priklausomybiÅ³ vaizdavimÄ…\n"
+#~ "  s: perjungti paketÅ³ dydÅ¾iÅ³ pasikeitimÅ³ vaizdavimÄ…\n"
+#~ "  v: perjungti versijÅ³ vaizdavimÄ…\n"
+#~ "  e: pereiti Ä¯ pilnÄ… vizualiÄ… aplinkÄ…\n"
+#~ "\n"
+#~ "  Taip pat JÅ«s galite nurodyti pakeitimus grupei paketÅ³.\n"
+#~ "  NorÄ—dami tai padaryti Ä¯raÅ¡ykite veiksmo simbolÄ¯ ir vienÄ… ar kelis\n"
+#~ "paketÅ³ pavadinimus po jo. Taip pat galite naudoti Å¡ablonus (patterns).\n"
+#~ "Veiksmas bus pritaikytas visiems paketams (galima nurodyti papildomus\n"
+#~ "veiksmus, visi jie bus pritaikyti visiems paketams, iÅ¡vardintiems po \n"
+#~ "veiksmo simbolio)\n"
+#~ "\n"
+#~ "Veiksmai:\n"
+#~ "  + : Ä®diegti\n"
+#~ "  - : PaÅ¡alinti\n"
+#~ "  _ : IÅ¡valyti\n"
+#~ "  = : sulaikyti\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 2005
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-09-12 20:36+0200\n"
 "Last-Translator: BjÃ¸rn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian <i18n-nb>\n"
@@ -162,7 +162,7 @@
 msgstr "Fjern ubrukte pakker som passer med dette filteret automatisk "
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -305,47 +305,47 @@
 "Merk: Ved Ã¥ velge Â«%sÂ» istedenfor\n"
 "      den virtuelle pakken Â«%sÂ»\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s er allerede installert og er av den Ã¸nskede versjonen (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s er ikke installert nÃ¥, sÃ¥ den blir ikke re-installert.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Pakke %s er ikke installert, sÃ¥ den blir ikke fjernet\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakke %s er ikke installert, kan ikke forby oppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pakke %s kan ikke oppgraderes, kan ikke forby oppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Merk: Velg oppgaven Â«%s: %sÂ» for installasjon\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Du kan bare oppgi en pakkeversjon med Â«installÂ»-kommandoen\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Du kan bare oppgi et arkiv med Â«installÂ»-kommandoen\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -354,7 +354,7 @@
 "Klarte ikke Ã¥ finne pakken Â«%sÂ», og mer enn 40\n"
 "pakker har Â«%sÂ» i navnet.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -363,13 +363,13 @@
 "Klarte ikke Ã¥ finne pakken Â«%sÂ». Men disse pakkene\n"
 "har Â«%sÂ» i navnet:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Fant ingen pakke med et navn eller en beskrivelse som passer med Â«%sÂ»\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -378,7 +378,7 @@
 "Fant ingen pakke som passer med Â«%sÂ», og mer enn 40\n"
 "pakker har Â«%sÂ» i beskrivelsen.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -387,6 +387,11 @@
 "Fant ingen pakke som passer med Â«%sÂ». Men disse pakkene\n"
 "har Â«%sÂ» i beskrivelsen:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Feil handlingstegn Â«%cÂ»\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Kan ikke kjÃ¸re sensible-pager, er dette et fungerende Debian-system?"
@@ -427,7 +432,7 @@
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -438,16 +443,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "nedlasting: Du mÃ¥ oppgi minst en pakke som skal lastes ned\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Klarte ikke Ã¥ lese kildelista"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Fant ingen pakke kalt Â«%sÂ»"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -504,95 +509,95 @@
 msgstr ""
 "Hva dette er? Det er selvsagt en elefant som blir spist av en slange.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Klarte ikke Ã¥ lese kildelista"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "men %s blir installert."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "men %s er installert og blir holdt tilbake."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "men %s er installert."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "men lar seg ikke installere"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " som er en virtuell pakke."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " eller"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Disse pakkene er Ã˜DELAGTE:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Disse pakkene er ikke i bruk og vil bli FJERNET:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Disse pakkene er holdt tilbake automatisk:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Disse NYE pakkene vil bli installert automatisk:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Disse pakkene vil bli fjernet automatisk:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Disse pakkene vil bli NEDGRADERT:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Disse pakkene blir holdt tilbake:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Disse pakkene vil bli INSTALLERT PÃ… NYTT:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Disse NYE pakkene vil bli installert:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Disse pakkene vil bli FJERNET:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Disse pakkene vil bli oppgradert:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Disse VIKTIGE pakkene vil bli FJERNET!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Disse VIKTIGE pakkene vil bli Ã˜DELAGT med denne handlingen:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -602,99 +607,226 @@
 "Ã¸delagt!\n"
 "          IKKE fortsett dersom du ikke vet NÃ˜YAKTIG hva du gjÃ¸r!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Jeg er klar over at dette er en svÃ¦rt dÃ¥rlig ide"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "For Ã¥ fortsette, skriv inn teksten Â«%sÂ»:\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Nei"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "For Ã¥ fortsette, skriv inn teksten Â«%sÂ»:\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Disse pakkene er ANBEFALT men blir IKKE installert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Disse pakkene er FORESLÃ…TT men blir IKKE installert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ingen pakker vil bli installert, oppgradert eller fjernet.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakker oppgradert, %lu nylig installert, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installert pÃ¥ nytt, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernes og %lu skal ikke oppgraderes.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Trenger Ã¥ hente %sB/%sB i installasjonspakker. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Trenger Ã¥ hente %sB i installasjonspakker. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Etter utpakking vil %sB bli brukt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Etter utpakking vil %sB bli frigjort.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Feil handlingstegn Â«%cÂ»\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ingen pakker Ã¥ vise -- oppgi pakkenavnene pÃ¥ linja etter Â«iÂ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Trykk Enter for Ã¥ fortsette."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Ingen pakker funnet -- oppgi pakkenavnene pÃ¥ linja etter Â«cÂ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Trykk Enter for Ã¥ fortsette."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Formatet for pakkevisninger"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^installer/slett pakker"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Disse NYE pakkene vil bli installert automatisk:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^installer/slett pakker"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Glem nye pakker"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Beholder pakkevalget\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - Merk pakker som automatisk installert k\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - Merk pakker som manuelt installert\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "krever"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vil du fortsette? [J/n/?]"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -705,7 +837,7 @@
 "Viser informasjon om avhengigheter.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -716,7 +848,7 @@
 "Viser ikke informasjon om avhengigheter.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -727,7 +859,7 @@
 "Versjoner vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -738,7 +870,7 @@
 "Versjoner vil ikke bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -749,7 +881,7 @@
 "StÃ¸rrelsesendringer vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -760,130 +892,102 @@
 "StÃ¸rrelsesendringer vil ikke bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Kommandoer:\n"
-"  j: fortsett installasjonen\n"
-"  n: avbryt og avslutt\n"
-"  i: vis informasjon om en eller flere pakker,\n"
-"     pakkenavnene bÃ¸r fÃ¸lge etter Â«iÂ»\n"
-"  c: vis Debian endringslogg(er) for en eller flere pakker,\n"
-"     pakkenavnene bÃ¸r fÃ¸lge etter Â«cÂ»\n"
-"  d: slÃ¥ av og pÃ¥ visning av informasjon om avhengigheter\n"
-"  s: slÃ¥ av og pÃ¥ visning av endringer i pakkestÃ¸rrelser\n"
-"  v: slÃ¥ av og pÃ¥ visning av versjoner\n"
-"  e: start det fullstendige visuelle grensesnittet\n"
-"\n"
-"  Du kan ogsÃ¥ oppgi endringer i pakkehandlingene.\n"
-"  For Ã¥ gjÃ¸re det mÃ¥ du trykke et handlingstegn etterfulgt av et eller "
-"flere\n"
-"pakkenavn eller mÃ¸nster. Handlingen vil bli utfÃ¸rt pÃ¥ alle pakkene. (Du kan\n"
-"oppgi flere handlinger, hver enkelt vil bli utfÃ¸rt pÃ¥ alle pakkene som er "
-"lista\n"
-"opp etterpÃ¥)\n"
-"\n"
-"Handlinger:\n"
-"  + : Installer\n"
-"  - :  Slett\n"
-"  _ : Slett helt\n"
-"  = : Hold igjen\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ugyldig respons. Skriv inn en gyldig kommando eller Â«?Â» for hjelp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Avslutt programmet"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Disse pakkene hadde utilfredsstilte avhengigheter:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Disse pakkene er Ã˜DELAGTE:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Feil under skriving av tilstandsfil"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ugyldig respons. Skriv inn en gyldig kommando eller Â«?Â» for hjelp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ugyldig respons. Skriv inn en gyldig kommando eller Â«?Â» for hjelp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "sÃ¸k: Du mÃ¥ oppgi minst ett sÃ¸keord\n"
@@ -1178,7 +1282,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter nedlastede filer som er foreldet"
 
@@ -1465,23 +1569,18 @@
 msgstr ""
 "Klarte ikke Ã¥ rette opp avhengigheter, noen pakker kan ikke installeres"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Kildelista kan ikke leses."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Klarte ikke Ã¥ tolke eller Ã¥pne pakkelista eller tilstandsfila."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "Du vil kanskje oppdatere pakkelista for Ã¥ rette pÃ¥ de manglende filene"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Klarer ikke Ã¥ Ã¥pne %s for Ã¥ skrive til den"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1754,17 +1853,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Som sorteringsmÃ¥te er Â«%sÂ» ugyldig"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompilert pÃ¥ %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1773,7 +1872,7 @@
 "\n"
 "NCurses-versjon: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1782,22 +1881,22 @@
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "Â«libsigc++Â»-versjon: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Bruk: aptitude [-S fnavn] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [valg] <handling> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1807,42 +1906,42 @@
 "modus):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Installer/oppgrader pakker\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Fjerner pakker\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Fjerner pakker og oppsettsfilene deres\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Beholder pakkevalget\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Fjern en hold-kommando for en pakke\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - Merk pakker som automatisk installert k\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Merk pakker som manuelt installert\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1850,17 +1949,17 @@
 msgstr ""
 " forby versjon - Forby aptitude Ã¥ oppgradere til en bestemt pakkeversjon.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Last ned listene over nye/oppgraderbare pakker\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - UtfÃ¸r en trygg oppgradering\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1869,75 +1968,75 @@
 " dist-upgrade - UtfÃ¸r en oppgradering, det kan vÃ¦re pakker blir installert "
 "og fjernet\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Glem hvilke pakker som er Â«nyeÂ»\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - SÃ¸k etter en pakke utifra navn og/eller uttrykk\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Vis detaljert informasjon om en pakke\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Slett nedlastede pakkefiler\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Slett eldre nedlastede pakkefiler\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " endringslogg    - Vis en pakkes endringslogg\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Les ned .deb-fila til en pakke\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Valg:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simuler handlinger, men ikke utfÃ¸r dem.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Bare last ned pakker, ikke installer eller slett noe.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             SpÃ¸r alltid om bekreftelse eller handlinger\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             Forutset at svaret pÃ¥ enkle ja/nei-spÃ¸rsmÃ¥l er Â«JaÂ»\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1945,59 +2044,59 @@
 msgstr ""
 " -F format      Oppgi et format for visning av sÃ¸keresultatet; se manualen\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 " -O rekkefÃ¸lge  Oppgir hvordan et sÃ¸keresultat skal sorteres; se manualen\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w bredde     Oppgi visingsbredde for formatering av sÃ¸keresultatet\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             PrÃ¸v hardt Ã¥ reparere Ã¸delagte pakker.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Vis hvilke versjoner av pakkene som skal installeres.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Vis pakkekrava til automatisk endrede pakker.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Vis endringene pÃ¥ installert stÃ¸rrelse pÃ¥ hver pakke.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v             Vis ekstra informasjon. (kan tilfÃ¸yes flere ganger)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [slippversjon]  Angi hvilken versjon pakker skal installeres fra\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o nÃ¸kkel=verdi  Sett direkte oppsettsvalget Â«nÃ¸kkelÂ»\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2006,62 +2105,62 @@
 " --with(out)-recommends\t Oppgi om anbefalte pakker skal hÃ¥ndteres\n"
 "                som strenge avhengigheter\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fnavn: Les den utvidede statusinfo-fila for aptitude fra fnavn.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Last ned ny pakkeliste ved oppstart.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : UtfÃ¸r en installasjonskjÃ¸ring ved oppstart.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptituden har ikke superku-krefter.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o krever et argument av formen nÃ¸kkel=verdi, fikk %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MERKELIG: mottok en ukjent valgkode\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Du kan bare oppgi enten -u eller -i\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "-u og -i kan ikke oppgis i kommandolinjemodus (dvs, med Â«installÂ»)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u og -i kan ikke oppgis med en kommando"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ukjent kommando Â«%sÂ»\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2092,7 +2191,7 @@
 msgid "Lost"
 msgstr "Tapt"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Minesveiper"
 
@@ -2269,7 +2368,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pakke"
 
@@ -3746,54 +3845,54 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Ehm, det er ingen feil. Dette burde ikke ha skjedd ..."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "SÃ¸k etter:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Du er allerede root."
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Underprosessen avsluttet med en feil -- skrev du inn rett passord?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Laster mellomlageret"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Vil du virkelig avslutte aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Vil du virkelig slette dine selvvalgte innstillinger og bruke "
 "standardinnstillingene?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pakker"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Vis tilgjengelige pakker og velg hvilken handlinger du vil utfÃ¸re"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3810,15 +3909,15 @@
 "andre,\n"
 "men under bestemte betingelser, se Â«lisensÂ» for mer informasjon."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "hjelp.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "LES_MEG"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3826,45 +3925,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Fortsett"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "ForhÃ¥ndsvisning av pakkeinstallasjonen"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Forh"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Noen pakker var skadet og har blitt reparert"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3873,24 +3972,24 @@
 "Ã… installere eller fjerne pakker krever at du er logget inn som root,\n"
 "noe du ikke er. Vil du logge deg inn som root nÃ¥?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Ikke bli root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil bli installert, oppgradert eller fjernet."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3903,7 +4002,7 @@
 "oppgraderes.\n"
 "Tast Â«UÂ» for Ã¥ forberede oppgradering."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3912,99 +4011,112 @@
 "Ã… oppdatere pakkelistene krever at du er logget inn som root,\n"
 "noe du ikke er. Vil du logge deg inn som root nÃ¥?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Sletter nedlastede filer"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Nedlastede filer er slettet"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Foreldede, nedlastede pakkefiler er blitt slettet"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Kast bort tid pÃ¥ Ã¥ finne miner"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Klarer ikke Ã¥ Ã¥pne %s for Ã¥ skrive til den"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^installer/slett pakker"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "UtfÃ¸r alle ventende installeringer og slettinger"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Oppdater pakkelista"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Se etter nye versjoner av pakkene"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Glem nye pakker"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker som er Â«nyeÂ»"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^Slett mellomlageret for pakker"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Slett alle pakkefiler som ble lastet ned tidligere"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Fjern ^foreldede filer"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slett pakkefiler som ikke lenger kan lastes ned"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Marker ^oppgraderbare"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle oppgraderbare pakker som ikke holdes tilbake"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Spill minesveiper"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Bli root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4013,68 +4125,68 @@
 "KjÃ¸r Â«suÂ» for Ã¥ bli root.  Dette vil starte programmet pÃ¥ nytt, men \n"
 "innstillingene blir bevart"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Last pakkelageret pÃ¥ nytt"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Last mellomlageret for pakker pÃ¥ nytt"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Avslutt"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Angre"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Angre den siste pakkeoperasjonen eller en gruppe operasjoner"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merk den valgte pakken for installasjon eller oppgradering"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Fjern"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Merk den valgte pakken for fjerning"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Slett helt"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Opphev alle handlinger med den valgte pakken"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Hold"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4082,11 +4194,11 @@
 "Opphev alle handlinger med den valgte pakken og beskytt den mot senere "
 "oppgradering"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Merk ^Auto"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4095,11 +4207,11 @@
 "Merk den valgte pakka som automatisk installert, \n"
 "den blir automatisk fjernet hvis ingen andre pakker avhenger av den"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Merk ^Manuell"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4108,11 +4220,11 @@
 "Merk den valgte pakka som manuelt installert,\n"
 "den blir ikke fjernet hvis du ikke fjerner den manuelt"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Forby versjon"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4121,207 +4233,207 @@
 "Forby installasjon av kandidatversjonen av den valgte pakka,\n"
 "nyere versjoner av pakka vil bli installert som vanlig"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformasjon"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Vis mer informasjon om den valgte pakka"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Endringslogg"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians endringslogg for den valgte pakka"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Finn"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "SÃ¸k etter en pakke"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Finn ^igjen"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Gjenta siste sÃ¸k"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "Be^grens visning"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Bruk et filter pÃ¥ pakkelista"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Ubegrenset visning"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Fjern filtrering av pakkelista"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Finn ^Ã˜delagt"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Finn neste pakke med utilfredsstilte avhengigheter"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^Innstillinger av grensesnittet"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "GjÃ¸r om pÃ¥ innstillingene som berÃ¸rer grensesnittet"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^HÃ¥ndtering av avhengigheter"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Annet"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "GjÃ¸r endringer i andre programinnstillinger"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Slett valgene"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Gjenopprett standardinnstillingene"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Neste"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Vis neste skjermbilde"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Forh"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Vis forrige skjermbilde"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Lukk"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Lukk dette skjermbildet"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Ny pakke^visning"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Lag en ny pakkevisning"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Ny visning etter ^kategori"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Vis pakker etter pakketype"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Vis informasjon om dette programmet"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Hjelp"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Vis hjelpen"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "Bruker^hÃ¥ndbok"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Vis en detaljert brukerhÃ¥ndbok"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^OSS"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over Ofte Spurte SpÃ¸rsmÃ¥l"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr ""
 "Vis hvilke viktige endringer som er blitt gjort i hver ny versjon av "
 "programmet"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Lisens"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Vis under hvilke betingelser du kan kopiere dette programmet"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "SÃ¸k"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Valg"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Visninger"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4329,11 +4441,11 @@
 "%s: Meny  %s: Hjelp  %s: avslutt  %s: Oppdater  %s: Last ned/installer/slett "
 "pakker"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ja_tast"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "nei_tast"
 
@@ -4375,13 +4487,58 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au!  Fikk signalet SIGQUIT, avslutter ... \n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ja"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Nei"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Kommandoer:\n"
+#~ "  j: fortsett installasjonen\n"
+#~ "  n: avbryt og avslutt\n"
+#~ "  i: vis informasjon om en eller flere pakker,\n"
+#~ "     pakkenavnene bÃ¸r fÃ¸lge etter Â«iÂ»\n"
+#~ "  c: vis Debian endringslogg(er) for en eller flere pakker,\n"
+#~ "     pakkenavnene bÃ¸r fÃ¸lge etter Â«cÂ»\n"
+#~ "  d: slÃ¥ av og pÃ¥ visning av informasjon om avhengigheter\n"
+#~ "  s: slÃ¥ av og pÃ¥ visning av endringer i pakkestÃ¸rrelser\n"
+#~ "  v: slÃ¥ av og pÃ¥ visning av versjoner\n"
+#~ "  e: start det fullstendige visuelle grensesnittet\n"
+#~ "\n"
+#~ "  Du kan ogsÃ¥ oppgi endringer i pakkehandlingene.\n"
+#~ "  For Ã¥ gjÃ¸re det mÃ¥ du trykke et handlingstegn etterfulgt av et eller "
+#~ "flere\n"
+#~ "pakkenavn eller mÃ¸nster. Handlingen vil bli utfÃ¸rt pÃ¥ alle pakkene. (Du "
+#~ "kan\n"
+#~ "oppgi flere handlinger, hver enkelt vil bli utfÃ¸rt pÃ¥ alle pakkene som er "
+#~ "lista\n"
+#~ "opp etterpÃ¥)\n"
+#~ "\n"
+#~ "Handlinger:\n"
+#~ "  + : Installer\n"
+#~ "  - :  Slett\n"
+#~ "  _ : Slett helt\n"
+#~ "  = : Hold igjen\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-08-17 15:21+0100\n"
 "Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -159,7 +159,7 @@
 "Verwijder automatisch ongebruikte pakketten die voldoen aan deze filter"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -302,50 +302,50 @@
 "Opmerking: \"%s\" geselecteerd in plaats van het\n"
 "     virtueel pakket \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s is reeds geÃ¯nstalleerd met de gevraagde versie (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s is op dit moment niet geÃ¯nstalleerd, dus zal het niet opnieuw worden "
 "geÃ¯nstalleerd.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Pakket %s is niet geÃ¯nstalleerd, dus wordt het niet verwijderd\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakket %s is niet geÃ¯nstalleerd, kan een opwaardering niet verbieden\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Pakket %s is niet opwaardeerbaar, kan een opwaardering niet verbieden\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Opmerking: de taak \"%s: %s\" geselecteerd voor installatie\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "U kunt enkel een pakketversie aangeven met een 'install'-commando.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "U kunt enkel een pakketarchief aangeven met een 'install'-commando.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -354,7 +354,7 @@
 "Pakket \"%s\" is niet gevonden, en meer dan 40\n"
 "pakketten hebben \"%s\" in hun naam.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -363,14 +363,14 @@
 "Pakket \"%s\" is niet gevonden. Wel hebben de volgende\n"
 "pakketten \"%s\" in hun naam:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Geen enkel pakket gevonden waarvan de naam of beschrijving overeenkomen met "
 "\"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -379,7 +379,7 @@
 "Geen enkel pakket gevonden dat overeenkomt met \"%s\", en meer dan 40\n"
 "pakketten hebben \"%s\" in hun beschrijving.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -389,6 +389,11 @@
 "volgende\n"
 "pakketten \"%s\" in hun beschrijving:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Slecht actiekarakter '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Kan sensible-pager niet uitvoeren, is dit een werkend Debian-systeem?"
@@ -428,7 +433,7 @@
 msgid "Invalid operation %s"
 msgstr "Ongeldige operatie %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -439,16 +444,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "ophalen: u moet minstens Ã©Ã©n pakket aangeven om op te halen\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Kon bronnenlijst niet lezen"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Kan geen pakket vinden met als naam \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -506,97 +511,97 @@
 "Wat het is? Het is een olifant die wordt opgegeten door een slang, "
 "natuurlijk.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Kon bronnenlijst niet lezen"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "maar %s wordt geÃ¯nstalleerd."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "maar %s wordt geÃ¯nstalleerd en wordt achtergehouden."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "maar %s is geÃ¯nstalleerd."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "maar het is niet installeerbaar"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " dat een virtueel pakket is."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " of"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "De volgende pakketten zijn BESCHADIGD:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr ""
 "De volgende pakketten zijn niet in gebruik en zullen worden VERWIJDERD:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "De volgende pakketten zijn automatisch achtergehouden:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "De volgende NIEUWE pakketten zullen automatisch worden geÃ¯nstalleerd:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "De volgende pakketten zullen automatisch worden VERWIJDERD:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "De volgende pakketten zullen automatisch worden GEDEGRADEERD:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "De volgende pakketen zijn achtergehouden:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "De volgende pakketten zullen worden GEHERINSTALLEERD:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "De volgende NIEUWE pakketten zullen worden geÃ¯nstalleerd:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "De volgende pakketten zullen worden VERWIJDERD:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "De volgende pakketten zullen worden opgewaardeerd:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "De volgende ESSENTIELE pakketten zullen worden VERWIJDERD!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "De volgende ESSENTIELE pakketten zullen worden BESCHADIGD door deze actie:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -606,108 +611,235 @@
 "beschadigen!\n"
 "         Ga NIET verder, tenzij u EXACT weet wat u aan het doen bent!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Ik weet dat dit een heel slecht idee is"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Om verder te gaan, typ de zin \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Nee"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Om verder te gaan, typ de zin \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 "De volgende pakketten worden AANGERADEN, maar zullen NIET worden "
 "geÃ¯nstalleerd:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 "De volgende pakketten worden GESUGGEREERD, maar zullen NIET worden "
 "geÃ¯nstalleerd:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 "Er zullen geen pakketten worden geÃ¯nstalleerd, opgewaardeerd of verwijderd.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakketten opgewaardeerd, %lu nieuwe geÃ¯nstalleerd, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geherinstalleerd, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu gedegradeerd, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu te verwijderen en %lu niet opwaarderen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Heb %sB/%sB archieven nodig. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Heb %sB archieven nodig. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Na uitpakken zal %sB worden gebruikt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Na uitpakken zal %sB worden vrijgemaakt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Slecht actiekarakter '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Er zijn geen te tonen pakketten -- geef de pakketnamen op de regel achter "
 "'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Druk op return om verder te gaan."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Er zijn geen pakketten gevonden -- geef de pakketnamen op de regel achter "
 "'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Druk op return om verder te gaan."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "De indelng van pakket-views"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Installeer/verwijder pakketten"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "De volgende NIEUWE pakketten zullen automatisch worden geÃ¯nstalleerd:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Installeer/verwijder pakketten"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Vergeet nieuwe pakketten"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Pakketten behouden\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - Pakketten aanduiden als automatisch geÃ¯nstalleerd\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - Pakketten aanduiden als handmatig geÃ¯nstalleerd\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "beveelt aan"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Wilt u verder gaan? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -718,7 +850,7 @@
 "Er zal afhankelijkheidsinformatie worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -729,7 +861,7 @@
 "Er zal geen afhankelijkheidsinformatie worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -740,7 +872,7 @@
 "Er zullen versies worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -751,7 +883,7 @@
 "Er zullen geen versies worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -762,7 +894,7 @@
 "Er zullen groottewijzigingen worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -773,130 +905,102 @@
 "Er zullen geen groottewijzigingen worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Commando's:\n"
-" y: ga verder met de installatie\n"
-" n: breek af en verlaat\n"
-" i: toon informatie over Ã©Ã©n of meer pakketten\n"
-"    de pakketnamen moeten volgen op 'i'.\n"
-" c: toon de Debian-changelogs voor Ã©Ã©n of meer pakketten;\n"
-"    de pakketnamen moeten volgen op 'c'\n"
-" d: schakel zicht van afhankelijkheidsinformatie\n"
-" s: schakel zicht van groottewijzigingen in pakketten\n"
-" v: schakel zicht van versies\n"
-" e: geef de volledige visuele interface\n"
-"\n"
-"  U kunt ook wijzigingen aanbrengen aan de verzameling van pakketacties.\n"
-"  Om dit te toen, typ een actiekarakter gevolgd door Ã©Ã©n of meer "
-"pakketnamen\n"
-"of -patronen. De actie zal worden toegepast op alle pakketten. (u kan "
-"bijkomende\n"
-"acties aangeven; elk zal worden toegepast op alle pakketten die erop "
-"volgen)\n"
-"\n"
-"Acties:\n"
-"  + : Installeer\n"
-"  - : Verwijder\n"
-"  _ : Wis (Purge)\n"
-"  = : Behoud\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ongeldig antwoord. Geef een geldig commando of '?' voor hulp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Sluit het programma af"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "De volgende pakketten hebben niet-voldane afhankelijkheden:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "De volgende pakketten zijn BESCHADIGD:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "Onmogelijk om %s te openen voor schrijven"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Fout bij schrijven naar statusbestand"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ongeldig antwoord. Geef een geldig commando of '?' voor hulp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ongeldig antwoord. Geef een geldig commando of '?' voor hulp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "opzoeking: U moet minstens Ã©Ã©n zoekterm opgeven\n"
@@ -1191,7 +1295,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Verwijderen van verouderde, opgehaalde bestanden"
 
@@ -1482,26 +1586,21 @@
 "Onmogelijk om afhankelijkheden te corrigeren, enkele pakketten kunnen niet "
 "geÃ¯nstalleerd worden"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "De bronnenlijst kon niet gelezen worden."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "De pakketlijst of het statusbestand kon niet worden ontleed of geopend."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "U wilt misschien de pakketlijsten bijwerken om deze ontbrekende bestanden te "
 "corrigeren."
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Onmogelijk om %s te openen voor schrijven"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1779,17 +1878,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ongeldig sorteerpolitiektype '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s gecompileerd in %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compiler: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1798,7 +1897,7 @@
 "\n"
 "NCurses-versie: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1807,22 +1906,22 @@
 "\n"
 "Curses-versie: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++-versie: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Gebruik: aptitude [-S fnaam] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opties] <actie> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1832,42 +1931,42 @@
 "modus starten):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Pakketten installeren/opwaarderen\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Pakketten verwijderen\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Pakketten en hun configuratiebestanden verwijderen\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Pakketten behouden\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Annuleer het behouden van een pakket\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - Pakketten aanduiden als automatisch geÃ¯nstalleerd\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Pakketten aanduiden als handmatig geÃ¯nstalleerd\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1876,17 +1975,17 @@
 " verboden-versie - Verbied aptitude van op te waarderen naar een specifieke "
 "pakketversie.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Lijsten van nieuwe/opwaardeerbare pakketten ophalen\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Een veilige opwaardering uitvoeren\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1895,69 +1994,69 @@
 " dist-upgrade - Een opwaardering uitvoeren, waarbij mogelijk pakketten "
 "worden geÃ¯nstalleerd of verwijderd\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr "forget-new   - Vergeet welke pakketten \"nieuw\" zijn\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Een pakket opzoeken op naam en/of op expressie\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Gedetailleerde informatie tonen van een pakket\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Opgehaalde pakketbestanden wissen\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Oude opgehaalde pakketbestanden wissen\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Bekijk de changelog van een pakket\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Het .deb-bestand van een pakket ophalen\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opties:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Deze helptekst\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Acties simuleren, maar ze niet werkelijk uitvoeren.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Enkel pakketten ophalen, niets installeren of verwijderen.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Steeds naar bevestiging of actie vragen\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1965,7 +2064,7 @@
 " -y             Veronderstel dat het antwoord op eenvoudige ja/nee-vragen "
 "'ja' is\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1974,7 +2073,7 @@
 " -F indeling      Een indeling aangeven voor de zoekresultaten; zie "
 "handleiding\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1982,26 +2081,26 @@
 " -O ordening       Geef aan hoe zoekresultaten moeten gesorteerd worden; zie "
 "handleiding\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 " -w breedte       Geeft de breedte aan voor weergave van zoekresultaten\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Probeert reparaties van gebroken pakketten te forceren\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Toont welke versies van pakketten geÃ¯nstalleerd zijn.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -2009,12 +2108,12 @@
 " -D             Toont de afhankelijkheden van automatisch gewijzigde "
 "pakketten\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Toont de wijziging in installatiegrootte van elk pakket.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -2022,7 +2121,7 @@
 " -v             Toont extra informatie. (kan meerdere keren worden "
 "meegegeven)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -2030,13 +2129,13 @@
 " -t [release]   Zet de release waarvan pakketten moeten geÃ¯nstalleerd "
 "worden\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o sleutel=val Zet de configuratie-optie genaamd 'sleutel' rechtstreeks\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2045,64 +2144,64 @@
 " --with(out)-recommends\tspecifieert of recommends al dan niet als sterke\n"
 "             afhankelijkheden worden behandeld\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fnaam: Lees de uitgebreide statusinfo van aptitude over fnaam.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Haal nieuwe pakketlijsten op bij het opstarten.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Voer een installatieloop uit bij het opstarten.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Deze aptitude heeft geen Super Koekrachten.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o vereist een argument van de vorm sleutel=waarde, heb %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "BIZAR: onbekende optiecode meegekregen\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Er mag slects Ã©Ã©n van -u of -i meegegeven worden.\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u en -i mogen niet meegegeven worden in commandolijnmodus (vb, met "
 "'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u en -i mogen niet meegegeven worden met een commando"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Onbekend commando \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2133,7 +2232,7 @@
 msgid "Lost"
 msgstr "Verloren"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Mijnenveger"
 
@@ -2311,7 +2410,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pakket"
 
@@ -3793,54 +3892,54 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Euh, er zijn geen fouten, dit zou niet mogen gebeuren..."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Zoek naar:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "U bent reeds root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Subproces is afgesloten met een fout -- heeft u uw wachtwoord correct "
 "ingegeven?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Laden van cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Aptitude echt afsluiten?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Echt uw persoonlijke instellingen negeren en de standaarden herladen?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pakketten"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Bekijk beschikbare pakketten en kies uit te voeren acties"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3857,15 +3956,15 @@
 "Help-menu. Dit is vrije software, en u bent vrij om het te verspreiden\n"
 "onder zekere voorwaarden, zie 'licentie' voor details."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3873,45 +3972,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Ga verder"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Preview van de pakketinstallatie."
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "V^orige"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Enkele pakketten zijn beschadigd en zijn gerepareerd"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3921,27 +4020,27 @@
 "die\n"
 "u momenteel niet heeft. Wenst u te wijzigen naar de root-account?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Word root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Word geen root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3954,7 +4053,7 @@
 "ze\n"
 "op te waarderen. Typ \"U\" om een opwaardering voor te bereiden."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3963,101 +4062,114 @@
 "Bijwerken van pakketlijsten vereist administratieve privileges, die\n"
 "u momenteel niet heeft. Wenst u te wijzigen naar de root-account?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Opgehaalde bestanden verwijderen"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Opgehaalde pakketbestanden zijn verwijderd"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Verouderde opgehaalde pakketbestanden zijn verwijderd"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Tijd verliezen bij het proberen vinden van mijnen"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Onmogelijk om %s te openen voor schrijven"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Installeer/verwijder pakketten"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Doe alle uitstaande installaties en verwijderingen"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Werk pakketlijst bij"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Controleer op nieuwe versies van pakketten"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Vergeet nieuwe pakketten"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Vergeet welke pakketten \"nieuw\" zijn"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "Kuis de ^pakketcache"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Verwijder pakketbestanden die vroeger opgehaald zijn"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "^Kuis de veroudere bestanden uit"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Verwijder pakketbestanden die niet langer kunnen opgehaald worden"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "^Markeer opwaardeerbaar"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Speel Mijnenveger"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Word ^root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4066,71 +4178,71 @@
 "Voer 'su' uit om root te worden; dit zal het programma herstarten, maar uw\n"
 "instellingen zullen bewaard blijven."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Herlaad pakketcache"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Herlaad de pakketcache"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Afsluiten"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Sluit het programma af"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Maak de laatste pakketoperatie of groep van operaties ongedaan."
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Installeren"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Duid het momenteel geselecteerde pakket aan voor installatie of opwaardering"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Verwijderen"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Duid het momenteel geselecteerde pakket aan voor verwijdering"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Wissen (purge)"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "Be^houden"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Annuleer alle acties voor het geselecteerde pakket"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Bevriezen"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4138,11 +4250,11 @@
 "Annuleer alle acties voor het geselecteerde pakket en bescherm het voor "
 "toekomstige opwaarderingen"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Markeer ^automatisch"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4151,11 +4263,11 @@
 "Markeer het geselecteerde pakket als automatisch geÃ¯nstalleerd;\n"
 "het zal automatisch worden verwijderd als er geen pakketten meer op steunen"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "^Markeer handmatig"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4164,11 +4276,11 @@
 "Markeer het geselecteerde pakket als handmatig geÃ¯nstalleerd;\n"
 "het zal niet worden verwijderd tenzij u het handmatig verwijdert"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "V^erboden versie"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4179,207 +4291,207 @@
 "nieuwere versies van het pakket zullen zoals gebruikelijk worden "
 "geÃ¯nstalleerd"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformatie"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Toon meer informatie over het geselecteerde pakket"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Toon de Debian-changelog van het geselecteerde pakket"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Zoek"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Zoek naar een pakket"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Zoek ^Opnieuw"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Herhaal de laatste zoekopdracht"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Beperk Weergave"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Pas een filter toe op de pakketlijst"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Hef Beperking Weergave Op"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Verwijder de filter van de pakketlijst"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Zo^ek Beschadigde"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Zoek het volgende pakket met niet-voldane afhankelijkheden"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^UI-opties"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Wijzig de instellingen die de gebruikersinterface aangaan"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Afhankelijkheidsafhandeling"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Wijzig de instellingen die bepalen hoe pakketafhankelijkheden worden "
 "behandeld"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "A^llerlei"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Wijzig allerlei programma-instellingen"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Inverteer opties"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Zet alle instellingen op de systeemstandaard"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Volgende"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Bekijk volgende weergave"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "V^orige"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Bekijk vorige weergave"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Sluiten"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Sluit deze weergave"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Nieuwe ^Pakket-View"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Maak een nieuwe standaard pakketview"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Nieuwe ^Categorische Bladeraar"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Doorblader pakketten per categorie"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Over"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Bekijk informatie over dit programma"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Help"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Bekijk de online help"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Gebruikershandleiding"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Bekijk de gedetailleerde programmahandleiding"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Bekijk een lijst van veel gestelde vragen"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr ""
 "Bekijk de belangrijke gemaakte wijzigingen in elke versie van het programma"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licentie"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Acties"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Zoek"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Opties"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Views"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Help"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4387,11 +4499,11 @@
 "%s: Menu  %s: Help  %s: Afsluiten  %s: Bijwerken  %s: Ophalen/Inst./Verw. "
 "Pakketten"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ja-toets"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "nee-toets"
 
@@ -4433,13 +4545,57 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Kuch! Kreeg SIGQUIT, stervend..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ja"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Nee"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Commando's:\n"
+#~ " y: ga verder met de installatie\n"
+#~ " n: breek af en verlaat\n"
+#~ " i: toon informatie over Ã©Ã©n of meer pakketten\n"
+#~ "    de pakketnamen moeten volgen op 'i'.\n"
+#~ " c: toon de Debian-changelogs voor Ã©Ã©n of meer pakketten;\n"
+#~ "    de pakketnamen moeten volgen op 'c'\n"
+#~ " d: schakel zicht van afhankelijkheidsinformatie\n"
+#~ " s: schakel zicht van groottewijzigingen in pakketten\n"
+#~ " v: schakel zicht van versies\n"
+#~ " e: geef de volledige visuele interface\n"
+#~ "\n"
+#~ "  U kunt ook wijzigingen aanbrengen aan de verzameling van pakketacties.\n"
+#~ "  Om dit te toen, typ een actiekarakter gevolgd door Ã©Ã©n of meer "
+#~ "pakketnamen\n"
+#~ "of -patronen. De actie zal worden toegepast op alle pakketten. (u kan "
+#~ "bijkomende\n"
+#~ "acties aangeven; elk zal worden toegepast op alle pakketten die erop "
+#~ "volgen)\n"
+#~ "\n"
+#~ "Acties:\n"
+#~ "  + : Installeer\n"
+#~ "  - : Verwijder\n"
+#~ "  _ : Wis (Purge)\n"
+#~ "  = : Behoud\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 2005
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-09-04 18:55+0200\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll at skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -156,7 +156,7 @@
 msgstr "Fjern ubrukte pakkar som passar med dette filteret automatisk"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -299,47 +299,47 @@
 "Merk: ved Ã¥ velja Â«%sÂ» istaden for\n"
 "      den virtuelle pakka Â«%sÂ»\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s er allereie installert med den fÃ¸respurde versjonen (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s er ikkje installert no, sÃ¥ han blir ikkje re-installert.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Pakke %s er ikkje installert, sÃ¥ han blir ikkje fjerna\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakke %s er ikkje installert, kan ikkje forby oppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pakke %s kan ikkje oppgraderast, kan ikkje forby oppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Merk: vel oppgÃ¥va Â«%s: %sÂ» for installasjon\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Du kan berre oppgje ein pakkeversjon med Â«installÂ»-kommandoen\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Du kan berre oppgje eit arkiv med Â«installÂ»-kommandoen\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -348,7 +348,7 @@
 "Klarte ikkje finna pakken Â«%sÂ», og meir enn 40\n"
 "pakkar har Â«%sÂ» i namnet sitt.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -357,14 +357,14 @@
 "Klarte ikkje finna pakken Â«%sÂ». Men desse pakkane\n"
 "har Â«%sÂ» i namnet sitt:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Klarte ikkje finna nokon pakke som har eit namn eller ei skildring\n"
 "som passar med Â«%sÂ»\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -373,7 +373,7 @@
 "Klarte ikkje finna nokon pakke som passar med Â«%sÂ», og meir enn 40\n"
 "pakkar har Â«%sÂ» i skildringa si.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -382,6 +382,11 @@
 "Klarte ikkje finna nokon pakke som passar med Â«%sÂ». Men desse pakkane\n"
 "har Â«%sÂ» i skildringa si:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Feil handlingsteikn Â«%cÂ»\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -422,7 +427,7 @@
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -433,16 +438,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "nedlasting: du mÃ¥ oppgje minste ein pakke for Ã¥ lasta ned\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Klarte ikkje lesa kjeldelista"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Klarte ikkje finna nokon pakke som har namnet Â«%sÂ»"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -500,95 +505,95 @@
 msgstr ""
 "Kva det er? Det er ein elefant som vert eten av ein slange sjÃ¸lvsagt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Klarte ikkje lesa kjeldelista"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "men %s blir installert."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "men %s er installert og vert halden tilbake."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "men %s er installert."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "men lÃ¨t seg ikkje installera"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " som er ein virtuell pakke."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " eller"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Desse pakkane er Ã˜YDELAGDE:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Desse pakkane er ikkje i bruk og vil bli FJERNA:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Desse pakkana er haldt tilbake automatisk."
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Desse NYE pakkane vil bli installert automatisk:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Desse pakkane vil bli fjerna automatisk:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Desse pakkane vil bli NEDGRADERT:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Desse pakkane blir haldt tilbake:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Desse pakkane vil bli INSTALLERT PÃ… NY:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Desse NYE pakkane vil bli installert:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Desse pakkane vil bli FJERNA:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Desse pakkane vil bli oppgradert:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Desse VIKTIGE pakkane vil bli FJERNA!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Desse VIKTIGE pakkane vil bli Ã˜YDELAGT med denne handlinga:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -598,99 +603,227 @@
 "Ã¸ydelagt!\n"
 "          IKKJE hald fram dersom du ikkje veit NÃ˜YAKTIG kva du gjer!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Eg er klar over at dette er ein svÃ¦rt dÃ¥rleg ide"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "For Ã¥ halda fram, skriv inn teksten Â«%sÂ»:\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Nei"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "For Ã¥ halda fram, skriv inn teksten Â«%sÂ»:\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Desse pakkane er FÃ˜RESLÃ…TT men vil IKKJE bli installert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Desse pakkane er FÃ˜RESLÃ…TT men blir IKKJE installert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ingen pakkar vil bli installert, oppgradert eller fjerna.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakkar oppgradert, %lu nyleg installert, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installert pÃ¥ ny, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Treng Ã¥ henta %sB/%sB med installasjonspakkar. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Treng Ã¥ henta %sB med installasjonspakkar. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Etter utpakking vil %sB vli brukt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Etter utpakking vil %sB bli frigjort.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Feil handlingsteikn Â«%cÂ»\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ingen pakkar Ã¥ vise -- oppgje pakkenamna pÃ¥ linja etter Â«iÂ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Trykk Enter for Ã¥ halda fram."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Fann ingen pakkar -- oppgje pakkenamna pÃ¥ linja etter Â«cÂ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Trykk Enter for Ã¥ halda fram."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Formatet for pakkevisingar"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Installer/fjern pakkar"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Desse NYE pakkane vil bli installert automatisk:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Installer/fjern pakkar"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^GlÃ¸ym nye pakkar"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Legg pakkar pÃ¥ hald\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+" markauto     - Merk pakkar som at dei er blitt installert automatisk\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - Merk pakkar som at dei er installert manuelt\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "tilrÃ¥r"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vil du halda fram? [J/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -701,7 +834,7 @@
 "Informasjon om pakkekrav vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -712,7 +845,7 @@
 "Informasjon om pakkekrav vil ikkje bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -723,7 +856,7 @@
 "Versjonar vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -734,7 +867,7 @@
 "Versjonar vil ikkje bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -745,7 +878,7 @@
 "Storleiksendringar vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -756,128 +889,102 @@
 "Storleiksendringar vil ikkje bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Kommandoar:\n"
-"  j: halda fram med installasjonen\n"
-"  n: avbryt og avslutt\n"
-"  i: vis informasjon om ein eller fleire pakkar\n"
-"     pakkenamna mÃ¥ komme etter Â«iÂ».\n"
-"  c: vis debian endringsloggar for ein eller fleire pakkar.\n"
-"     pakkenamna mÃ¥ komme etter Â«cÂ».\n"
-"  d: slÃ¥ av og pÃ¥ vising av informasjon om pakkekrav\n"
-"  s: slÃ¥ av og pÃ¥ vising av endringar i pakkestorleikar\n"
-"  v: slÃ¥ av og pÃ¥ vising av versjonar\n"
-"  e: start det fullstendige visuelle grensesnittet\n"
-"\n"
-"  Du kan ogsÃ¥ oppgje endringar i pakkehandlingane.\n"
-"  For Ã¥ gjera det mÃ¥ du trykka eit handlingsteikn etterfulgt av eit eller\n"
-"fleire pakkenamn eller mÃ¸nster. Handlinga vil bli utfÃ¸rt pÃ¥ alle pakkane.\n"
-"(Du kan oppgje fleire handlingar, kvar enkelt vil bli utfÃ¸rt pÃ¥ alle\n"
-"pakkane som er lista opp etterpÃ¥)\n"
-"\n"
-"Handlingar:\n"
-"  + : Installer\n"
-"  - : Fjern\n"
-"  _ : Reinsk\n"
-"  = : Hald\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ugyldig respons. Skriv inn ein gyldig kommando eller Â«?Â» for hjelp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Avsluttar programmet"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Desse pakkane hadde utilfredsstilte pakkekrav:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Desse pakkane er Ã˜YDELAGDE:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Feil under skriving av tilstandsfil"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ugyldig respons. Skriv inn ein gyldig kommando eller Â«?Â» for hjelp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ugyldig respons. Skriv inn ein gyldig kommando eller Â«?Â» for hjelp.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1172,7 +1279,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Slettar nedlasta filer som er forelda"
 
@@ -1459,24 +1566,19 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Klarte ikkje rette opp pakkekrav, nokre pakkar kan ikkje installerast"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Kjeldelista kan ikkje lesast."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Du vil kanskje oppdatere pakkelista for Ã¥ retta pÃ¥ dei manglande filene"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Klarer ikkje opna %s for Ã¥ skriva til ho"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1749,17 +1851,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ugyldig type Â«%sÂ» pÃ¥ sorteringsmetode"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompilert pÃ¥ %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1768,7 +1870,7 @@
 "\n"
 "NCurses-versjon: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1777,22 +1879,22 @@
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "Â«libsigc++Â»-versjon: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Bruk: aptitude [-S fnamn] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [val] <handling> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1802,43 +1904,43 @@
 "modus):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Installer/oppgrader pakkar\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Fjernar pakkar\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Fjernar pakkar og oppsettsfilene deira\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Legg pakkar pÃ¥ hald\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Fjern ein hald-kommando for ein pakke\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 " markauto     - Merk pakkar som at dei er blitt installert automatisk\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Merk pakkar som at dei er installert manuelt\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1846,17 +1948,17 @@
 msgstr ""
 " forby versjon - Forby aptitude Ã¥ oppgradere til ein sÃ¦rskild pakkeversjon.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Last ned liste over nye/oppgraderbare pakkar\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - UtfÃ¸r ei trygg oppgradering\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1865,75 +1967,75 @@
 " dist-upgrade - UtfÃ¸r ei oppgradering, det kan vera pakkar blir installert "
 "og fjerna\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - GlÃ¸ym kva for pakkar som er Â«nyeÂ»\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - SÃ¸k etter ein pakke etter namn og/eller uttrykk\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Vis detaljert informasjon om ei pakke\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Slett nedlasta pakkefiler\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Slett gamle nedlasta pakkefiler\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Vis endringsloggen til ein pakke\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Last ned .deb-fila for ein pakke\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Val:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simuler handlingar, men ikkje utfÃ¸r dei.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Berre lasta ned pakkar, ikkje installer eller fjern noko.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             SpÃ¸r alltid om stadfesting eller handlingar\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             Forutset at svaret pÃ¥ enkle ja/nei-spÃ¸rsmÃ¥l er Â«JaÂ»\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1941,7 +2043,7 @@
 msgstr ""
 " -F format      Oppgje eit format for vising av sÃ¸kjeresultat; sjÃ¥ manualen\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1949,55 +2051,55 @@
 " -O rekkjefÃ¸lgje Oppgjev korleis eit sÃ¸kjeresultat skal sorterast; sjÃ¥ "
 "manualen\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 " -w breidde     Oppgje visingsbreidde for formatering av sÃ¸kjeresultat\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             PrÃ¸v hardt Ã¥ reparere Ã¸ydelagde pakkar.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Vis kva for versjonar av pakkar som skal installerast.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Vis pakkekrava til automatisk endra pakkar.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Vis endringane pÃ¥ installert storleik pÃ¥ kvar pakke.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 " -v             Vis ekstra informasjon. (kan tilfÃ¸yast fleire gongar)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 " -t [sleppversjon]  Set sleppversjonen som pakkar skal installerast frÃ¥\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o nÃ¸kkel=verdi    Set direkte oppsettsvalet som heiter Â«nÃ¸kkelÂ»\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2006,63 +2108,63 @@
 " --with(out)-recommends\tOppgje om tilrÃ¥dde og/eller fÃ¸reslÃ¥tte pakkar skal\n"
 "                handterast som strenge pakkekrav\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fnamn: Les den utvida statusinfo-fila for aptitude frÃ¥ fnamn.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Last ned ny pakkeliste ved oppstart.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : UtfÃ¸r ei installasjonskÃ¸yring ved oppstart.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptituden har ikkje Super Cow Powers.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o krev eit argument pÃ¥ forma nÃ¸kkel=verdi, fekk %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MERKJELEG: mottok ein ukjent valkode\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Berre ein av -u og -i kan oppgjevast\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u og -i kan ikkje oppgjevast i kommandolinjemodus (dvs, med Â«installÂ»)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u og -i kan ikkje oppgjevast med ein kommando"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ukjent kommando Â«%sÂ»\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2093,7 +2195,7 @@
 msgid "Lost"
 msgstr "Tapt"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Minesveiper"
 
@@ -2270,7 +2372,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pakke"
 
@@ -3739,54 +3841,54 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Hmm, det er ingen feil her, dette skulle ikkje ha hendt.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "SÃ¸k etter:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Du er allereie root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Underprosessen avslutta med ein feil -- skreiv du passordet ditt rett?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Lastar mellomlager"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Vil du verkeleg avslutta Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Vil du verkeleg forkasta dine eigne instillingar og lasta inn "
 "standardinnstillingane?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pakkar"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Vis tilgjengelege pakkar og vel kva handlingar som skal utfÃ¸rast"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3803,15 +3905,15 @@
 "Dette er fri programvare og du er velkomen til Ã¥ dela vidare programmet\n"
 "under visse vilkÃ¥r; sjÃ¥ Â«lisensÂ» for detaljar."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "hjelp.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "LESMEG"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3819,45 +3921,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Hald fram"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "FÃ¸rehandsvising av pakkeinstallasjon"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^FÃ¸rre"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Nokre pakkar var Ã¸ydelagde og har blitt fiksa"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3866,23 +3968,23 @@
 "Ã… installera/fjerna pakkar krev at du har administrative rettar, som\n"
 "du ikkje har no. Vil du endra til root-kontoen?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Ikkje bli root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakkar vil bli installert, oppgradert eller fjerna."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3895,7 +3997,7 @@
 "oppgraderast.\n"
 "Tast Â«UÂ» for Ã¥ fÃ¸rebu oppgradering."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3904,99 +4006,112 @@
 "Oppdatering av pakkelister krev administrative rettar, som\n"
 "du ikkje har no. Vil du endra til root-kontoen?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Bruke tida pÃ¥ Ã¥ finna miner"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Slettar nedlasta filer"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Nedlasta pakkefiler er blitt sletta"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Forelda nedlasta pakkefiler er blitt sletta"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Bruke tida pÃ¥ Ã¥ finna miner"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Klarer ikkje opna %s for Ã¥ skriva til ho"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Installer/fjern pakkar"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "UtfÃ¸r installering og fjerning av pakkar"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Oppdater pakkeliste"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "SjÃ¥ etter nye versjonar av pakkar"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^GlÃ¸ym nye pakkar"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "GlÃ¸ym kva for pakkar som er Â«nyeÂ»"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^Reinsk pakkemellomlageret"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Slett tidlegare nedlasta pakkefiler"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Slett ^forelda filer"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slett pakkefiler som ikkje kan hentast lenger"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Marker ^Oppgraderbare"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Spel minesveipar"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Bli ^root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4005,68 +4120,68 @@
 "KÃ¸yrer Â«suÂ» for Ã¥ bli root. Dette vil starta programmet pÃ¥ ny, men\n"
 "instillingane vil bli tatt vare pÃ¥."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Last inn igjen pakkemellomlageret"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Lastar pakkelagert inn pÃ¥ ny"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Avslutt"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Avsluttar programmet"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Angra"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Angrar den siste pakkehandlinga eller gruppe av handlingar"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merkjer den valde pakke for installasjon eller oppgradering"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Fjern"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Merkjer den valde pakke for fjerning"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Reinsk ut"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Ta vare pÃ¥"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Avbryt handlingane pÃ¥ den valde pakken"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Hald tilbake"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4074,11 +4189,11 @@
 "Avbryt handlinar pÃ¥ den valde pakken og vernar han mot framtidige "
 "oppgraderingar."
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Merk ^Auto"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4087,11 +4202,11 @@
 "Merk den valde pakken som om han er automatisk installert.\n"
 "Pakken vil automatisk bli fjerna viss ingen andre pakkar treng han."
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Merk ^Manuell"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4100,11 +4215,11 @@
 "Merk den valde pakken som om han var manuelt installert.\n"
 "Pakken vil ikkje bli fjerna viss du ikkje fjernar han manuelt."
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Forby versjon"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4113,204 +4228,204 @@
 "Forby versjonskandidaten til den valde pakken frÃ¥ Ã¥ bli installert.\n"
 "Nyare versjonar av pakken vil bli installert som vanleg"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformasjon"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Vis meir informasjon om den valde pakken"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Endringslogg"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis debianendringsloggen til den valde pakken"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Finn"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "SÃ¸k etter ein pakke"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Finn i^gjen"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Gjer opp igjen det siste sÃ¸ket"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Filtrer vising"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Bruk eit filter pÃ¥ pakkelista"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Avfiltrer vising"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Fjernar filteret frÃ¥ pakkelista"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Finn ^Ã˜ydelagd"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Finn den neste pakken med pakkekrav som ikkje er tilfredsstilt"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^Brukargrensesnitt"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Endrar innstillingane for brukargrenseflata"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Handsaming av pakkekrav"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Endra innstillingar som pÃ¥verkar handtering av pakkekrav"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Ymse"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Endra ymse programinnstillingar"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Tilbakestill innstillingar"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Stiller tilbake alle innstillingar til standardverdiar"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Neste"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Vis neste skjermbilete"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^FÃ¸rre"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Vis fÃ¸rre skjermbilete"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Lukk"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Lukk dette skjermbilete"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Ny pakke^vising"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Lag ei ny standard for pakkevising"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Ny ^katagorivising"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Bla i pakkar etter kategori"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Vis informasjon om dette programmet"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Hjelp"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Vis hjelp"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Brukarvegleiing"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Vis den detaljerte programmanualen"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^SOS"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Vis ei liste over spÃ¸rsmÃ¥l og svar"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Vis viktige endringar som er gjort i kvar versjon av programmet"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Lisens"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Vis vilkÃ¥ra for Ã¥ kopiera programmet"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Handlingar"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "SÃ¸k"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Val"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Visingar"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4318,11 +4433,11 @@
 "%s: Meny  %s: Hjelp  %s: Avslutt  %s:Oppdater  %s: Lasta ned/Installer/"
 "Fjerna pakkar"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
@@ -4364,13 +4479,57 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Oops!  Fekk SIGQUIT, dÃ¸r..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ja"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Nei"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Kommandoar:\n"
+#~ "  j: halda fram med installasjonen\n"
+#~ "  n: avbryt og avslutt\n"
+#~ "  i: vis informasjon om ein eller fleire pakkar\n"
+#~ "     pakkenamna mÃ¥ komme etter Â«iÂ».\n"
+#~ "  c: vis debian endringsloggar for ein eller fleire pakkar.\n"
+#~ "     pakkenamna mÃ¥ komme etter Â«cÂ».\n"
+#~ "  d: slÃ¥ av og pÃ¥ vising av informasjon om pakkekrav\n"
+#~ "  s: slÃ¥ av og pÃ¥ vising av endringar i pakkestorleikar\n"
+#~ "  v: slÃ¥ av og pÃ¥ vising av versjonar\n"
+#~ "  e: start det fullstendige visuelle grensesnittet\n"
+#~ "\n"
+#~ "  Du kan ogsÃ¥ oppgje endringar i pakkehandlingane.\n"
+#~ "  For Ã¥ gjera det mÃ¥ du trykka eit handlingsteikn etterfulgt av eit "
+#~ "eller\n"
+#~ "fleire pakkenamn eller mÃ¸nster. Handlinga vil bli utfÃ¸rt pÃ¥ alle "
+#~ "pakkane.\n"
+#~ "(Du kan oppgje fleire handlingar, kvar enkelt vil bli utfÃ¸rt pÃ¥ alle\n"
+#~ "pakkane som er lista opp etterpÃ¥)\n"
+#~ "\n"
+#~ "Handlingar:\n"
+#~ "  + : Installer\n"
+#~ "  - : Fjern\n"
+#~ "  _ : Reinsk\n"
+#~ "  = : Hald\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 2005
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.15.6\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-08-13 12:48+0200\n"
 "Last-Translator: Micha³ Politowski <l10n at mp.pl.eu.org>\n"
 "Language-Team: Polish\n"
@@ -149,7 +149,7 @@
 msgstr "Usuwanie tylko nieu¿ywanych pakietów pasuj±cych do wzorca"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -292,47 +292,47 @@
 "Uwaga: Wybrano pakiet \"%s\" zamiast\n"
 "       pakietu wirtualnego \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "Jest ju¿ zainstalowana ¿±dana wersja pakietu \"%s\" (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "Pakiet %s nie jest zainstalowany, nie zostanie wiêc reinstalowany.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Pakiet %s nie jest zainstalowany, nie zostanie wiêc usuniêty.\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakiet %s nie jest zainstalowany, nie mo¿na zakazaæ uaktualniania\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pakiet %s nie ma uaktualnienia, nie mo¿na zakazaæ uaktualniania\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Uwaga: wybranie zadania \"%s: %s\" do instalacji\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Wersjê pakietu mo¿na podaæ tylko przy poleceniu \"install\".\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Archiwum pakietu mo¿na podaæ tylko przy poleceniu \"install\"\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -341,7 +341,7 @@
 "Nie znaleziono pakietu \"%s\".\n"
 "Nazwy ponad 40 pakietów zawieraj± \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -350,12 +350,12 @@
 "Nie znaleziono pakietu \"%s\".\n"
 "Nastêpuj±ce pakiety maj± \"%s\" w nazwie:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Nie znaleziono pakietu, którego nazwa lub opis zawiera³yby \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -364,7 +364,7 @@
 "Nie znaleziono pakietu z \"%s\" w nazwie.\n"
 "Opisy ponad czterdziestu pakietów zawieraj± \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -373,6 +373,11 @@
 "Nie znaleziono pakietu z \"%s\" w nazwie.\n"
 "Opisy nastêpuj±cych pakietów zawieraj± \"%s\":\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Nieznana akcja \"%c\"\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Nie mo¿na uruchomiæ programu sensible-pager. Czy¿by to nie by³ Debian?"
@@ -414,7 +419,7 @@
 msgid "Invalid operation %s"
 msgstr "B³êdna operacja '%s'"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -425,16 +430,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "download: nale¿y podaæ przynajmniej jeden pakiet do pobrania\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Nie mo¿na odczytaæ listy ¼róde³"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Nie znaleziono pakietu \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -488,95 +493,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Co to jest? Oczywi¶cie s³oñ zjadany przez wê¿a.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Nie mo¿na odczytaæ listy ¼róde³ pakietów"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "ale zaplanowana jest instalacja wersji %s."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "ale wersja %s jest zainstalowana i zatrzymana."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ale zainstalowana jest wersja %s."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "którego nie mo¿na zainstalowaæ"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " który jest pakietem wirtualnym."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " lub"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Nastêpuj±ce pakiety nie s± u¿ywane i zostan± USUNIÊTE:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Nastêpuj±ce pakiety zosta³y automatycznie zatrzymane:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Nastêpuj±ce NOWE pakiety zostan± automatycznie zainstalowane:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Nastêpuj±ce pakiety zostan± automatycznie USUNIÊTE:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nastêpuj±ce pakiety zostan± COFNIÊTE:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Nastêpuj±ce pakiety zosta³y zatrzymane:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Nastêpuj±ce pakiety zostan± PONOWNIE zainstalowane:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Nastêpuj±ce NOWE pakiety zostan± zainstalowane:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Nastêpuj±ce pakiety zostan± USUNIÊTE:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Nastêpuj±ce pakiety zostan± uaktualnione:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Nastêpuj±ce ISTOTNE pakiety zostan± USUNIÊTE!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Nastêpuj±ce ISTOTNE pakiet bêd± mia³y NIESPE£NIONE zale¿no¶ci:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -585,101 +590,229 @@
 "UWAGA: Wykonanie tej akcji prawdopodobnie spowoduje powa¿ne problemy!\n"
 "       NIE kontynuuj, o ile nie wiesz DOK£ADNIE, co chcesz zrobiæ!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Zdajê sobie sprawê, ¿e to bardzo z³y pomys³"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Aby kontynuowaæ napisz \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Tak"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Nie"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Aby kontynuowaæ napisz \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Nastêpuj±ce pakiety POLECANE przez inne NIE zostan± zainstalowane:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Nastêpuj±ce pakiety SUGEROWANE przez inne NIE zostan± zainstalowane:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nie zostan± zainstalowane, uaktualnione ani usuniête ¿adne pakiety.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakietów uaktualnianych, %lu instalowanych, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ponownie instalowanych, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu cofanych, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu do usuniêcia i %lu nie uaktualnianych.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Do pobrania %sB/%sB archiwów. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Do pobrania %sB archiwów. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Zajête po rozpakowaniu: %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Zwolnione po rozpakowaniu: %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Nieznana akcja \"%c\"\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Brak pakietów do wy¶wietlenia -- po poleceniu \"i\" nale¿y podaæ nazwy "
 "pakietów.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Wci¶nij return."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Brak pakietów -- po poleceniu \"c\" nale¿y podaæ nazwy pakietów.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Wci¶nij return."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Format widoku pakietów"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "Za^instaluj/usuñ pakiety"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Nastêpuj±ce NOWE pakiety zostan± automatycznie zainstalowane:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "Za^instaluj/usuñ pakiety"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Zapomnij o nowo¶ciach"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Zatrzymanie pakietów\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+" markauto     - Zaznaczenie pakietów jako automatycznie zainstalowanych\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - Zaznaczenie pakietów jako rêcznie zainstalowanych\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "poleca"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Kontynuowaæ? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -690,7 +823,7 @@
 "Zale¿no¶ci bêd± pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -701,7 +834,7 @@
 "Zale¿no¶ci nie bêd± pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -712,7 +845,7 @@
 "Wersje bêd± pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -723,7 +856,7 @@
 "Wersje nie bêd± pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -734,7 +867,7 @@
 "Zmiany rozmiaru bêd± pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -745,133 +878,108 @@
 "Zmiany rozmiaru nie bêd± pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Polecenia:\n"
-"  y: kontynuacja instalacji\n"
-"  n: przerwanie instalacji, zakoñczenie programu\n"
-"  i: wy¶wietlenie informacji o pakietach,\n"
-"     ich nazwy nale¿y podaæ po \"i\"\n"
-"  c: wy¶wietlenie dzienników zmian pakietów,\n"
-"     ich nazwy nale¿y podaæ po \"c\"\n"
-"  d: prze³±czenie pokazywania zale¿no¶ci\n"
-"  s: prze³±czenie pokazywania zmian rozmiarów pakietów\n"
-"  v: prze³±czenie pokazywania wersji\n"
-"  e: przej¶cie do interfejsu pe³noekranowego\n"
-"\n"
-"  Mozna tak¿e wprowadziæ zmiany do planowanych akcji.\n"
-"  W tym celu nale¿y wpisaæ znak okre¶laj±cy akcjê, a po nim nazwy pakietów\n"
-"lub wzorce. Akcja bêdzie dotyczyæ wszystkich podanych pakietów. (Mo¿na te¿\n"
-"wpisaæ wiêcej akcji. Ka¿da bêdzie dotyczyæ pakietów podanych po niej.)\n"
-"\n"
-"Akcje:\n"
-"  + : instalacja\n"
-"  - : usuniêcie\n"
-"  _ : wyczyszczenie\n"
-"  = : zatrzymanie\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Nieprawid³owe polecenie. Proszê podaæ polecenie, lub \"?\" dla uzyskania "
 "pomocy.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Koñczy program"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Nastêpuj±ce pakiety maj± NIESPE£NIONE zale¿no¶ci:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "B³±d w czasie zapisu informacji o stanie"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Nieprawid³owe polecenie. Proszê podaæ polecenie, lub \"?\" dla uzyskania "
 "pomocy.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Nieprawid³owe polecenie. Proszê podaæ polecenie, lub \"?\" dla uzyskania "
 "pomocy.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1167,7 +1275,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Usuwanie nieaktualnych plików pakietów"
 
@@ -1453,23 +1561,18 @@
 msgstr ""
 "Nie mo¿na poprawiæ zale¿no¶ci, czê¶æ pakietów nie mo¿e byæ zainstalowana"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Nie mo¿na odczytaæ listy ¼róde³."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Nie uda³o siê odczytaæ lub przetworzyæ list pakietów lub pliku stanu."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "Mo¿na uaktualniæ listy pakietów aby uzupe³niæ brakuj±ce pliki"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Nie mo¿na otworzyæ %s do zapisu"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1745,17 +1848,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Nieznany sposób sortowania '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s skompilowany %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1764,7 +1867,7 @@
 "\n"
 "Wersja NCurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1773,22 +1876,22 @@
 "\n"
 "Wersja Curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "Wersja libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "U¿ycie: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opcje] <akcja> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1797,43 +1900,43 @@
 "  Akcje (je¶li nie podane aptitude uruchamia siê w trybie interaktywnym):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Instalacja/uaktualnienie pakietów\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Usuniêcie pakietów\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Usuniêcie pakietów i ich plików konfiguracyjnych\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Zatrzymanie pakietów\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Anylowanie zatrzymania pakietów\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 " markauto     - Zaznaczenie pakietów jako automatycznie zainstalowanych\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Zaznaczenie pakietów jako rêcznie zainstalowanych\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1841,17 +1944,17 @@
 msgstr ""
 " forbid-version - Zablokowanie uaktualniania do okre¶lonej wersji pakietu.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Pobranie list nowych/uaktualnionych pakietów\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Bezpieczne uaktualnienie systemu\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1860,75 +1963,75 @@
 " dist-upgrade - Uaktualnienie systemu; mo¿liwa instalacja/usuniêcie "
 "pakietów\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Usuniêcie informacji, które pakiety s± nowe\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Wyszukiwanie pakietów wed³ug nazwy/wyra¿enia\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Wy¶wietlanie szczegó³owych informacji o pakiecie\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Usuniêcie pobranych plików pakietów\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Usuniêcie starych plików pakietów\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Wy¶wietlanie dziennika zmian pakietu\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Pobranie pliku .deb pakietu\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opcje:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Ten tekst pomocy\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Symualcja akcji bez ich wykonania\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Pobranie pakietów bez instalacji lub usuwania czegokolwiek\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Pytanie o potwierdzenie wykonywanych akcji\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             Przyjêcie odpowiedzi \"tak\" na pytania typu tak/nie\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1936,43 +2039,43 @@
 msgstr ""
 " -F format      Format wy¶wietlania wyników wyszukiwania; patrz podrêcznik\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 " -O order       Sposób sortowania wyników wyszukiwania; patrz podrêcznik\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w width       Szeroko¶æ wy¶wietlania wyników wyszukiwania\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Agresywne próby naprawnienia niespe³nionych zale¿no¶ci\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Wy¶wietlanie wersji pakietów do instalacji\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Wy¶wietlanie zale¿no¶ci automatycznie zmienianych pakietów\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Wy¶wietlanie zmian rozmiarów pakietów.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -1980,7 +2083,7 @@
 " -v             Wy¶wietlanie dodatkowych informacji (mo¿na podaæ "
 "wielokrotnie)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -1988,12 +2091,12 @@
 " -t [wydanie]   Ustalenie wydania z którego powinny pochodziæ instalowane "
 "pakiety\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o nazwa=warto¶æ  Bezpo¶rednie ustawienie warto¶ci podanej opcji\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2002,63 +2105,63 @@
 " --with(out)-recommends\tCzy traktowaæ rekomendacje (sugestie) jak\n"
 "                silne zale¿no¶ci\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fname: Odczyt rozszerzonych informacji o stanie z pliku fname.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u:     : Uaktualnienie listy pakietów przy starcie.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Przeprowadzenie instalacji przy starcie.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Ten aptitude nie posiada Mocy Super Krowy.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o wymaga podania argumentu postaci nazwa=warto¶æ, otrzymano %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "DZIWNE: otrzymano nieznany kod opcji\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Mo¿na podaæ tylko jedn± z opcji -u i -f\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u ani -i nie mo¿na podaæ dla trybu wiersza poleceñ (np. z \"install\")"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u ani -i nie mo¿na podaæ razem z poleceniem"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Nieznane polecenie:\"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2089,7 +2192,7 @@
 msgid "Lost"
 msgstr "Przegrana"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Saper"
 
@@ -2264,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 18 10 35 9 10 2 1 1 12 14 32 19 15"
 
-#: src/pkg_columnizer.cc:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pakiet"
 
@@ -3737,52 +3840,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Hm, nie wyst±pi³ ¿aden b³±d. Nie mo¿esz tego widzieæ.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Znajd¼:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Ju¿ jeste¶ administratorem."
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Podproces zakoñczy³ siê b³êdem -- czy podano poprawne has³o?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Odczyt stanu"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Zakoñczyæ Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Przywróciæ ustawienia domy¶lne rezygnuj±c z wprowadzonych zmian?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pakiety"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Przegl±danie dostêpnych pakietów, wybór dzia³añ na nich"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3800,15 +3903,15 @@
 "na okre¶lonych warunkach; szczegó³owe informacje mo¿na znale¼æ\n"
 "wybieraj±c pozycjê Licencja z menu Pomoc."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-pl.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3816,45 +3919,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Dalej"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Przegl±d planowanych dzia³añ"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Przegl±danie i modyfikowanie akcji do wykonania"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Poprzedni"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Niektóre pakiety mia³y niespe³nione zale¿no¶ci"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3863,25 +3966,25 @@
 "Instalowanie/usuwanie pakietów wymaga uprawnieñ administratora,\n"
 "których nie posiadasz. Czy chcesz siê prze³±czyæ na konto administratora?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Prze³±cz"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Nie prze³±czaj"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "Trwa uaktualnianie listy pakietów lub instalacja."
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3894,7 +3997,7 @@
 "w bie¿±cych wersjach.\n"
 "Wci¶nij \"U\" aby przygotowaæ uaktualnienie."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3903,99 +4006,112 @@
 "Uaktualnianie listy pakietów wymaga uprawnieñ administratora,\n"
 "których nie posiadasz. Czy chcesz siê prze³±czyæ na konto administratora?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Strata czasu na poszukiwanie min"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Usuwanie pobranych plików"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Usuniêto pobrane pliki pakietów"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Usuniêto nieaktualne pliki pakietów"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Strata czasu na poszukiwanie min"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Nie mo¿na otworzyæ %s do zapisu"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "Za^instaluj/usuñ pakiety"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Przeprowadza zaplanowane instalacje/usuniêcia"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Uaktualnij listê pakietów"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Sprawdza dostêpno¶æ nowszych wersji pakietów"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Zapomnij o nowo¶ciach"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Usuwa informacje, które pakiety s± nowe"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "Wyczy¶æ ^archiwum pakietów"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Usuwa wszystkie pobrane wcze¶niej pliki"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "^Usuñ nieaktualne pliki"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Zaznacz ^do uaktualnienia"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Zaznacza do uaktualnienia wszystkie mo¿liwe nie zatrzymane pakiety"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Saper"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Administrator"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4004,68 +4120,68 @@
 "U¿ywa \"su\" do uzyskania uprawnieñ administratora.\n"
 "Program zostanie zrestartowany, ale ustawienia zostan± zachowane"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Od¶wie¿ archiwum pakietów"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Ponownie odczytuje archiwum pakietów"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Zakoñcz"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Koñczy program"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Cofa ostatni± operacjê lub grupê operacji"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Instaluj"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Dodaje wybrany pakiet do instalowanych/uaktualnianych"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Usuñ"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Dodaje wybrany pakiet do usuwanych"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Wyczy¶æ"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Pozostaw"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Odwo³uje planowane dzia³ania na wybranym pakiecie"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Zatrzymaj"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4073,11 +4189,11 @@
 "Odwo³uje planowane dzia³ania na wybranym pakiecie i zapobiega jego "
 "uaktualnieniom w przysz³o¶ci"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "^Automatyczny"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4086,11 +4202,11 @@
 "Oznacza wybrany pakiet jako zainstalowany automatycznie,\n"
 "czyli przeznaczony do usuniêcia, gdy nie bêdzie przez nic wymagany"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "¯±^dany"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4099,11 +4215,11 @@
 "Oznacza wybrany pakiet jako zainstalowany na ¿±danie\n"
 "i nie podlegaj±cy automatycznemu usuwaniu"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "Za^blokuj wersjê"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4112,215 +4228,215 @@
 "Nie zezwala na instalacjê kandyduj±cej wersji wybranego pakietu;\n"
 "nowsze wersje bed± instalowane normalnie"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformacje"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Wy¶wietla szczegó³owe informacje o wybranym pakiecie"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Dziennik zmian"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Wy¶wietla dziennik zmian wybranego pakietu"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Znajd¼"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Szuka pakietu"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Znajd¼ ^nastêpny"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Powtarza wyszukiwanie"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Filtruj"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Ogranicza wy¶wietlan± listê pakietów"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Usuñ filtr"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Usuwa ograniczenie wy¶wietlanej listy pakietów"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Znajd¼ ^problem"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Szuka kolejnego pakietu z niespe³nionymi zale¿no¶ciami"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "Opcje ^interfejsu"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Zmienia opcje dotycz±ce interfejsu u¿ytkownika"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Zale¿no¶ci"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Ró¿ne"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Zmienia ró¿ne inne opcje programu"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Przywróæ domy¶lne"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Przywraca wszystkim opcjom warto¶ci domy¶lne"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Nastêpny"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Wy¶wietla nastêpny widok"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Poprzedni"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Wy¶wietla poprzedni widok"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Zamknij"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Zamyka bie¿±cy widok"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Nowy ^widok pakietów"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Tworzy nowy, standardowy widok listy pakietów"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Nowa przegl±darka ^kategorii"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Pozwala na przegl±danie pakietów wed³ug kategorii"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^O Aptitude"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Wy¶wietla informacje o programie"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Pomoc"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Wy¶wietla pomoc Aptitude"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "Podrêcznik ^u¿ytkownika"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Wy¶wietla podrêcznik u¿ytkownika programu"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Wy¶wietla najczê¶ciej zadawane pytania na temat Aptitude"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Wy¶wietla najwa¿niejsze zmiany w kolejnych wersjach programu"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licencja"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Wy¶wietla warunki rozpowszechniania programu"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Akcje"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Znajd¼"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Opcje"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Widoki"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Menu  %s: Pomoc  %s: Zakoñcz  %s: Uaktualnij  %s: Instaluj/usuñ pakiety"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "t"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
@@ -4363,13 +4479,56 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au! SIGQUIT, czas umieraæ..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Tak"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Nie"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Polecenia:\n"
+#~ "  y: kontynuacja instalacji\n"
+#~ "  n: przerwanie instalacji, zakoñczenie programu\n"
+#~ "  i: wy¶wietlenie informacji o pakietach,\n"
+#~ "     ich nazwy nale¿y podaæ po \"i\"\n"
+#~ "  c: wy¶wietlenie dzienników zmian pakietów,\n"
+#~ "     ich nazwy nale¿y podaæ po \"c\"\n"
+#~ "  d: prze³±czenie pokazywania zale¿no¶ci\n"
+#~ "  s: prze³±czenie pokazywania zmian rozmiarów pakietów\n"
+#~ "  v: prze³±czenie pokazywania wersji\n"
+#~ "  e: przej¶cie do interfejsu pe³noekranowego\n"
+#~ "\n"
+#~ "  Mozna tak¿e wprowadziæ zmiany do planowanych akcji.\n"
+#~ "  W tym celu nale¿y wpisaæ znak okre¶laj±cy akcjê, a po nim nazwy "
+#~ "pakietów\n"
+#~ "lub wzorce. Akcja bêdzie dotyczyæ wszystkich podanych pakietów. (Mo¿na "
+#~ "te¿\n"
+#~ "wpisaæ wiêcej akcji. Ka¿da bêdzie dotyczyæ pakietów podanych po niej.)\n"
+#~ "\n"
+#~ "Akcje:\n"
+#~ "  + : instalacja\n"
+#~ "  - : usuniêcie\n"
+#~ "  _ : wyczyszczenie\n"
+#~ "  = : zatrzymanie\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 2005
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: aptitude 0.2.14-3\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-08-26 18:00+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianPT.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -157,7 +157,7 @@
 "Reomver automaticamente pacotes nÃ£o usados que coincidam com este filtro"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -300,49 +300,49 @@
 "Nota : a seleccionar \"%s\" em vez do\n"
 "       pacote virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s jÃ¡ estÃ¡ instalado na versÃ£o pedida (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s nÃ£o estÃ¡ actualmente instalado, portanto nÃ£o serÃ¡ reinstalado.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "O pacote %s nÃ£o estÃ¡ instalado, portanto nÃ£o serÃ¡ removido\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "O pacote %s nÃ£o estÃ¡ instalado, nÃ£o Ã© possÃvel proibir uma actualizaÃ§Ã£o\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "O pacote %s nÃ£o Ã© actualizÃ¡vel, nÃ£o Ã© possÃvel proibir uma actualizaÃ§Ã£o\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Nota: a seleccionar a tarefa \"%s: %s\" para instalaÃ§Ã£o\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "SÃ³ pode especificar uma versÃ£o de um pacote com o comando 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "SÃ³ pode especificar um repositÃ³rio com o comando 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -351,7 +351,7 @@
 "NÃ£o foi possÃvel encontrar o pacote \"%s\", e mais de 40\n"
 "pacotes contÃ©m \"%s\" no seu nome.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -360,14 +360,14 @@
 "NÃ£o foi possÃvel encontrar o pacote \"%s\". No entanto,\n"
 "estes pacote possuem \"%s\" no seu nome:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "NÃ£o foi possÃvel encontrar nenhum pacote em que o nome ou a descriÃ§Ã£o "
 "coincida com \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -376,7 +376,7 @@
 "NÃ£o foi possÃvel encontrar nenhum pacote que coincida com \"%s\", e\n"
 "mais de 40 pacotes contÃ©m \"%s\" na sua descriÃ§Ã£o.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -385,6 +385,11 @@
 "NÃ£o foi possÃvel encontrar nenhum pacote que coincida com \"%s\".\n"
 "No entanto, estes pacotes contÃ©m \"%s\" na sua descriÃ§Ã£o:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Caracter de acÃ§Ã£o '%c' nÃ£o disponÃvel\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -426,7 +431,7 @@
 msgid "Invalid operation %s"
 msgstr "OperaÃ§Ã£o invÃ¡lida %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -437,16 +442,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "download: deve especificar pelo menos um pacote para download\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "NÃ£o foi possÃvel ler a lista de fontes"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "NÃ£o foi possÃvel encontrar nenhum pacote chamado \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -502,95 +507,95 @@
 msgstr ""
 "O que Ã© isso? Isso Ã© um elefante a ser comido por uma cobra, Ã© claro.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "NÃ£o foi possÃvel ler a lista das fontes"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "mas %s irÃ¡ ser instalado."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "mas %s estÃ¡ instalado e Ã© mantido."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "mas %s estÃ¡ instalado."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "mas nÃ£o Ã© instalÃ¡vel."
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " o qual Ã© um pacote virtual."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " ou"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Os seguintes pacotes estÃ£o DANIFICADOS:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Os seguintes pacotes nÃ£o sÃ£o usados e serÃ£o REMOVIDOS:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Os seguintes pacotes foram automaticamente mantidos:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Os seguintes NOVOS pacotes serÃ£o automaticamente instalados:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Os seguintes pacotes serÃ£o automaticamente REMOVIDOS:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os seguintes pacotes serÃ£o alterados para uma versÃ£o ANTERIOR:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Os seguintes pacotes foram mantidos:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Os seguintes pacotes serÃ£o REINSTALADOS:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Os seguintes NOVOS pacotes serÃ£o instalados:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Os seguintes pacotes serÃ£o REMOVIDOS:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Os seguintes pacotes serÃ£o actualizados:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Os seguintes pacotes ESSENCIAIS serÃ£o REMOVIDOS !\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Os seguintes pacotes ESSENCIAIS ficarÃ£o DANIFICADOS por esta acÃ§Ã£o:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -600,103 +605,232 @@
 "pare!\n"
 "        NÃƒO continue a menos que saiba EXACTAMENTE o que estÃ¡ a fazer!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Estou ciente de que esta Ã© um ideia muito mÃ¡."
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Para continuar, introduza a frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Sim"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "NÃ£o"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Para continuar, introduza a frase \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Os seguintes pacotes estÃ£o RECOMENDADOS mas NÃƒO serÃ£o instalados:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Os seguintes pacotes estÃ£o SUGERIDOS mas NÃƒO serÃ£o instalados:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nenhum pacote serÃ¡ instalado, actualizado ou removido.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pacotes actualizados, %lu novos instalados, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu alterados para uma versÃ£o anterior, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para serem removidos e %lu nÃ£o actualizados.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Ã‰ preciso obter %sB/%sB de ficheiros. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Ã‰ preciso obter %sB de ficheiros. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Depois de desempacotar serÃ£o utilizados %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Depois de desempacotar, serÃ£o libertados.%sB\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Caracter de acÃ§Ã£o '%c' nÃ£o disponÃvel\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "NÃ£o existem pacotes para mostrar -- introduza os nomes dos pacotes na linha "
 "a seguir a 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Pressione Return para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "NÃ£o foram encontrados -- introduza os nomes dos pacotes na linha a seguir a "
 "'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Pressione Return para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "O formato de exibiÃ§Ã£o para vistas de pacotes"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Instalar/remover pacotes"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Os seguintes NOVOS pacotes serÃ£o automaticamente instalados:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Instalar/remover pacotes"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^F Esquecer novos pacotes"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Manter pacotes na versÃ£o actual\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+" markauto     - Marcar pacotes como tendo sido automaticamente instalados\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+" unmarkauto   - Marcar pacotes como tendo sido manualmente instalados\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "recomenda"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Deseja continuar ? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -707,7 +841,7 @@
 "InformaÃ§Ã£o de dependÃªncias serÃ¡ exibida.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -718,7 +852,7 @@
 "InformaÃ§Ã£o de dependÃªncias nÃ£o serÃ¡ exibida.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -729,7 +863,7 @@
 "VersÃµes serÃ£o exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -740,7 +874,7 @@
 "VersÃµes nÃ£o serÃ£o exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -751,7 +885,7 @@
 "AlteraÃ§Ãµes de tamanho serÃ£o exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -762,134 +896,108 @@
 "AlteraÃ§Ãµes de tamanho nÃ£o serÃ£o exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Comandos :\n"
-"  y: continua com a instalaÃ§Ã£o\n"
-"  n: aborta e termina\n"
-"  i: mostra a informaÃ§Ã£o sobre um ou mais pacotes\n"
-"     os nomes dos pacotes devem seguir 'i'.\n"
-"  c: mostra os changelogs de Debian de um ou mais pacotes;\n"
-"     osÂ·nomesÂ·dosÂ·pacotesÂ·devemÂ·seguirÂ·'c'.\n"
-"  d : muda a exibiÃ§Ã£o de informaÃ§Ã£o de dependÃªncia\n"
-"  s : muda a exibiÃ§Ã£o de alteraÃ§Ã£o no tamanho de pacotes\n"
-"  v : muda a exibiÃ§Ã£o de versÃµes\n"
-"  e : entra no interface completamente visual\n"
-"\n"
-"  TambÃ©m pode especificar modificaÃ§Ãµes para o conjunto de acÃ§Ãµes de\n"
-"  pacotes. Para fazÃª-lo, digite um caracter de acÃ§Ã£o seguido por um ou\n"
-"  mais nomes de pacotes ou padrÃµes. A acÃ§Ã£o serÃ¡ aplicada a todos os\n"
-"  pacotes. (Pode especificar acÃ§Ãµes adicionais; cada acÃ§Ã£o serÃ¡\n"
-"  aplicada a todos os pacotes que a seguirem)\n"
-"\n"
-"AÃ§Ãµes :\n"
-"  + : Instalar\n"
-"  - : Remover\n"
-"  _ : Apagar\n"
-"  = : Manter\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Resposta invÃ¡lida.  Por favor, introduza um comando vÃ¡lido ou '?' para "
 "ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Sair do programa"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Os seguintes pacotes possuem dependÃªncias nÃ£o satisfeitas:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Os seguintes pacotes estÃ£o DANIFICADOS:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Erro ao escrever o ficheiro do estado"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 "Resposta invÃ¡lida.  Por favor, introduza um comando vÃ¡lido ou '?' para "
 "ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 "Resposta invÃ¡lida.  Por favor, introduza um comando vÃ¡lido ou '?' para "
 "ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "pesquisa: Deve fornecer pelo menos um termo para pesquisar\n"
@@ -1187,7 +1295,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "NÃ£o foi possÃvel limpar a lista de diretorias"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "A apagar os ficheiros obsoletos a que foi feito o download"
 
@@ -1477,27 +1585,22 @@
 "NÃ£o foi possÃvel corrigir as dependÃªncias, alguns pacotes nÃ£o podem ser "
 "instalados"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes nÃ£o pode ser lida."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "As listas de pacotes ou o ficheiro de estado nÃ£o pode ser interpretado ou "
 "aberto."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Pode querer actualizar as listas de pacotes para corrigir os ficheiros em "
 "falta"
 
-#: 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/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1783,17 +1886,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo de polÃtica de ordenaÃ§Ã£o '%s' invÃ¡lido"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilado em %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1802,7 +1905,7 @@
 "\n"
 "VersÃ£o do NCurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1811,22 +1914,22 @@
 "\n"
 "VersÃ£o do Curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "versÃ£o de libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "UtilizaÃ§Ã£o: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opÃ§Ãµes] <acÃ§Ã£o> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1836,44 +1939,44 @@
 "interactivo):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Instalar/actualizar pacotes\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Remover pacotes\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Remover pacotes e os seus ficheiros de configuraÃ§Ã£o\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Manter pacotes na versÃ£o actual\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Cancelar o comando hold para um pacote\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 " markauto     - Marcar pacotes como tendo sido automaticamente instalados\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 " unmarkauto   - Marcar pacotes como tendo sido manualmente instalados\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1882,18 +1985,18 @@
 " forbid-version - ProÃbir o aptitude de actualizar para uma versÃ£o "
 "especÃfica de um pacote.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 " update       - Fazer o download das listas de pacotes novos/actualizados\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Executar uma actualizaÃ§Ã£o segura\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1902,57 +2005,57 @@
 " dist-upgrade - Executar uma actualizaÃ§Ã£o, possivelmente instalando e "
 "removendo pacotes\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Esquecer quais os pacotes que sÃ£o \"novos\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Procurar por um pacote por nome e/ou expressÃ£o\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Mostrar informaÃ§Ã£o detalhada acerca de um pacote\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Apagar pacotes jÃ¡ transferidos\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Apagar pacotes antigos jÃ¡ transferidos\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Ver o registo de alteraÃ§Ãµes de um pacote\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Fazer o download do ficheiro .deb para um pacote\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  OpÃ§Ãµes:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Este texto de ajuda\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simular acÃ§Ãµes, mas sem as executar.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1960,12 +2063,12 @@
 " -d             Fazer apenas o download de pacotes, nÃ£o instalar ou remover "
 "nada.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Pedir sempre por confirmaÃ§Ã£o ou acÃ§Ãµes\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1973,7 +2076,7 @@
 " -y             Assumir que a resposta para simples perguntas de sim/nÃ£o "
 "seja 'sim'\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1982,7 +2085,7 @@
 " -F formato      Especifica um formato para exibiÃ§Ã£o dos resultados da "
 "pesquisa; ver o manual\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1990,7 +2093,7 @@
 " -O ordem       Especifica como os resultados das pesquisas devem ser "
 "ordenados; ver o manual\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -1998,18 +2101,18 @@
 " -w largura      Especifica a largura de exibiÃ§Ã£o para formatar os "
 "resultados de pesquisa\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Tentar agressivamente corrigir pacotes danificados.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Exibir as versÃµes de pacotes que irÃ£o ser instalados.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -2017,33 +2120,33 @@
 " -D             Exibir as dependÃªncias dos pacotes automaticamente "
 "modificados.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Exibir a alteraÃ§Ã£o no tamanho instalado de cada pacote.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 " -v             Exibir informaÃ§Ã£o extra. (pode ser fornecido vÃ¡rias vezes)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 " -t [release]   Define de qual distribuiÃ§Ã£o os pacotes devem ser instalados\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o chave=val     Define directamente a configraÃ§Ã£o da opÃ§Ã£o chamada "
 "'chave'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2052,65 +2155,65 @@
 " --with(out)-recommends\tEspecifica se as recomendaÃ§Ãµes devem ser \n"
 "                tratadas como dependÃªncias fortes\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fname: LÃª a informaÃ§Ã£o de estado extendido do aptitude do fname.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 " -u      : Faz o download de novas lista de pacotes na inicializaÃ§Ã£o.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Executa uma execuÃ§Ã£o de instalaÃ§Ã£o na inicializaÃ§Ã£o.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Este aptitude nÃ£o contÃ©m Poderes de Super Vaca.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o necessita de um argumento na forma chave=valor, tem %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ESTRANHO: recebida uma opÃ§Ã£o de cÃ³digo desconhecida\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Apenas uma das opÃ§Ãµes -u e -i pode ser especificada\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u e -i nÃ£o podem ser especificadas em modo de linha de comando (ex. com "
 "'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u e -i nÃ£o podem ser especificadas com um comando"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Comando desconhecido \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2141,7 +2244,7 @@
 msgid "Lost"
 msgstr "Perdeu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Campo Minado"
 
@@ -2319,7 +2422,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pacote"
 
@@ -3801,54 +3904,54 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Er, nÃ£o ocorreu nenhum erro, isto nÃ£o deveria ter acontecido.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Procurar por: "
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "VocÃª jÃ¡ Ã© root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Subprocesso saiu com um erro -- introduziu a sua password corretamente?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "A carregar a cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Deseja realmente sair do Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Deseja realmente anular as suas configuraÃ§Ãµes pessoais e utilizar as padrÃµes?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pacotes"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Visualizar os pacotes disponÃveis e escolher as acÃ§Ãµes a executar"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3864,15 +3967,15 @@
 "veja 'licenÃ§a' no menu Ajuda. Este Ã© um software livre e Ã© encorajado \n"
 "a distribuÃ-lo sob certas condiÃ§Ãµes; veja a 'licenÃ§a' para detalhes."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3880,45 +3983,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continuar"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "PrevisÃ£o da instalaÃ§Ã£o de pacotes"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^P Anterior"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns pacotes tinham dependÃªncias quebradas e foram corrigidos"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3927,26 +4030,26 @@
 "Instalar/remover pacotes requer privilÃ©gios de administrador, que\n"
 "actualmente nÃ£o possui. Deseja mudar para a conta de root?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Tornar-se root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "NÃ£o tornar-se root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3958,7 +4061,7 @@
 "Alguns pacotes podiam ser actualizados, mas escolheu nÃ£o os actualizar.\n"
 "Carregue em \"U\" para preparar uma actualizaÃ§Ã£o."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3967,101 +4070,114 @@
 "Actualizar a lista de pacotes requer privilÃ©gios de administrador, que\n"
 "actualmente nÃ£o possui. Deseja mudar para a conta de root ?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "A apagar ficheiros transferidos"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Ficheiros de pacotes transferidos foram apagados"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Ficheiros de pacotes obsoletos transferidos foram apagados"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, 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:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "NÃ£o foi possÃvel abrir %s para gravaÃ§Ã£o"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Instalar/remover pacotes"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Executar todas as instalaÃ§Ãµes e remoÃ§Ãµes pendentes"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^U Actualizar a lista de pacotes"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Checar por novas versÃµes de pacotes"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^F Esquecer novos pacotes"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer que pacotes sÃ£o \"novos\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^C Limpar cache de pacotes"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Apagar ficheiros de pacotes que foram previamente transferidos"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Limpar ficheiros ^obsoletos"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "^U Marcar ActualizÃ¡veis"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^P Jogar Campo Minado"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^B Tornar-se root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4070,71 +4186,71 @@
 "Executar 'su' para tornar-se root. Esta operaÃ§Ã£o irÃ¡ reiniciar o\n"
 "programa, mas as suas configuraÃ§Ãµes serÃ£o guardadas."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Reler cache de pacotes"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Reler a cache de pacotes"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Q Terminar"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfaz a Ãºltima operaÃ§Ã£o ou grupo de operaÃ§Ãµes"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 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:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Remover"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o pacote actualmente seleccionado para remoÃ§Ã£o"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Ficar com"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar qualquer acÃ§Ã£o no pacote seleccionado"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Manter"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4142,11 +4258,11 @@
 "Cancelar qualquer acÃ§Ã£o no pacote seleccionado e protegÃª-lo de futuras "
 "actualizaÃ§Ãµes"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Marcar ^Auto"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4155,11 +4271,11 @@
 "Marcar o pacote seleccionado como tendo sido automaticamente instalado;\n"
 "serÃ¡ automaticamente removido se nenhum outro pacote depender dele"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Marcar ^Manual"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4168,11 +4284,11 @@
 "Marcar o pacote seleccionado como tendo sido manualmente instalado;\n"
 "nÃ£o irÃ¡ ser removido a menos que vocÃª o remova manualmente"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^F ProÃbir VersÃ£o"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4181,217 +4297,217 @@
 "ProÃbir a versÃ£o candidata do pacote seleccionado de ser instalada;\n"
 "versÃµes mais recentes deste pacote serÃ£o instaladas como de costume"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformaÃ§Ã£o"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Mostrar mais informaÃ§Ãµes acerca do pacote seleccionado"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^C Registo de alteraÃ§Ãµes"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar o registo de alteraÃ§Ãµes Debian do pacote seleccionado"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^F Procurar"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Procurar por um pacote"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "^A Procurar de novo"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Repetir a Ãºltima procura"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Limitar a vista"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Aplicar um filtro Ã  lista de pacotes"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^U Retirar limite Ã  vista"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Remover o filtro da lista de pacotes"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "^B Procurar Quebrado"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Procurar o prÃ³ximo pacote com depedÃªncias nÃ£o satisfeitas:"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^UI OpÃ§Ãµes da interface"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Altera as configuraÃ§Ãµes que afectam a interface do utilizador"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "GestÃ£o de ^DependÃªncias"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^MiscelÃ¢nea"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Altera as configuraÃ§Ãµes diversas do programa"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Reverter as opÃ§Ãµes"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Reset a todas as configuraÃ§Ãµes para os padrÃµes do sistema"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^N PrÃ³ximo"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Visualizar a prÃ³xima pÃ¡gina"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^P Anterior"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Visualizar a pÃ¡gina anterior"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^C Fechar"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Fechar esta pÃ¡gina"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Nova ^VisÃ£o de Pacote"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Criar uma nova visÃ£o de pacote padrÃ£o"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "^B Novo Navegador de Categorias"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Navega pelos pacotes por categoria"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^A Sobre"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Ver informaÃ§Ãµes sobre este programa."
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^H Ajuda"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Visualiza a ajuda on-line"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Manual do Utilizador"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Ver o manual do programa detalhado"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Ver a lista de perguntas frequentes"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Ver as alteraÃ§Ãµes importantes feitas em cada versÃ£o do programa"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^LicenÃ§a"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "AcÃ§Ãµes"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Procurar"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "OpÃ§Ãµes"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Menu %s: Ajuda %s: Terminar %s: Actualizar %s: Instalar/Remover Pcts."
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "chave_sim"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "chave_nÃ£o"
 
@@ -4433,13 +4549,55 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ouch ! Recebi um SIGQUIT, tou a morrer..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Sim"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "NÃ£o"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Comandos :\n"
+#~ "  y: continua com a instalaÃ§Ã£o\n"
+#~ "  n: aborta e termina\n"
+#~ "  i: mostra a informaÃ§Ã£o sobre um ou mais pacotes\n"
+#~ "     os nomes dos pacotes devem seguir 'i'.\n"
+#~ "  c: mostra os changelogs de Debian de um ou mais pacotes;\n"
+#~ "     osÂ·nomesÂ·dosÂ·pacotesÂ·devemÂ·seguirÂ·'c'.\n"
+#~ "  d : muda a exibiÃ§Ã£o de informaÃ§Ã£o de dependÃªncia\n"
+#~ "  s : muda a exibiÃ§Ã£o de alteraÃ§Ã£o no tamanho de pacotes\n"
+#~ "  v : muda a exibiÃ§Ã£o de versÃµes\n"
+#~ "  e : entra no interface completamente visual\n"
+#~ "\n"
+#~ "  TambÃ©m pode especificar modificaÃ§Ãµes para o conjunto de acÃ§Ãµes de\n"
+#~ "  pacotes. Para fazÃª-lo, digite um caracter de acÃ§Ã£o seguido por um ou\n"
+#~ "  mais nomes de pacotes ou padrÃµes. A acÃ§Ã£o serÃ¡ aplicada a todos os\n"
+#~ "  pacotes. (Pode especificar acÃ§Ãµes adicionais; cada acÃ§Ã£o serÃ¡\n"
+#~ "  aplicada a todos os pacotes que a seguirem)\n"
+#~ "\n"
+#~ "AÃ§Ãµes :\n"
+#~ "  + : Instalar\n"
+#~ "  - : Remover\n"
+#~ "  _ : Apagar\n"
+#~ "  = : Manter\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-10-06 15:35-0300\n"
 "Last-Translator: Goedson Teixeira PaixÃ£o <goedson at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -158,7 +158,7 @@
 msgstr "Reomver automaticamente pacotes nÃ£o usados que casem com este filtro"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -301,50 +301,50 @@
 "Nota : selecionando \"%s\" ao invÃ©s do\n"
 "       pacote virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s jÃ¡ estÃ¡ instalado na versÃ£o requisitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s nÃ£o estÃ¡ atualmente instalado, portanto nÃ£o serÃ¡ reinstalado.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Pacote %s nÃ£o estÃ¡ instalado, portanto nÃ£o serÃ¡ removido\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pacote %s nÃ£o estÃ¡ instalado, nÃ£o Ã© possÃvel proibir uma atualizaÃ§Ã£o\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pacote %s nÃ£o Ã© atualizÃ¡vel, nÃ£o Ã© possÃvel proibir uma atualizaÃ§Ã£o\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Nota : selecionando a tarefa \"%s: %s\" para instalaÃ§Ã£o\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 "VocÃª pode especificar uma versÃ£o de pacote somente com um comando 'install'\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "VocÃª pode especificar um repositÃ³rio de pacotes somente com um comando "
 "'install'\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -353,7 +353,7 @@
 "NÃ£o foi possÃvel encontrar o pacote \"%s\", e mais de 40\n"
 "pacotes contÃ©m \"%s\" em seu nome.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -362,14 +362,14 @@
 "NÃ£o foi possÃvel encontrar o pacote \"%s\". PorÃ©m, os pacotes\n"
 "a seguir possuem \"%s\" em seu nome :\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "NÃ£o foi possÃvel encontrar nenhum pacote cujo nome ou descriÃ§Ã£o casasse com "
 "\"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -378,7 +378,7 @@
 "NÃ£o foi possÃvel encontrar nenhum pacote que casasse com \"%s\", e\n"
 "mais de 40 pacotes contÃ©m \"%s\" em sua descriÃ§Ã£o.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -387,6 +387,11 @@
 "NÃ£o foi possÃvel encontrar nenhum pacote que casasse com \"%s\".\n"
 "PorÃ©m, os pacotes a seguir contÃ©m \"%s\" em sua descriÃ§Ã£o :\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Caracter de aÃ§Ã£o ruim '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -430,7 +435,7 @@
 msgid "Invalid operation %s"
 msgstr "OperaÃ§Ã£o %s invÃ¡lida"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -441,16 +446,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "download : vocÃª deve especificar pelo menos um pacote para download\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "NÃ£o foi possÃvel ler a lista de fontes"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "NÃ£o foi possÃvel encontrar um pacote de nome \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -506,95 +511,95 @@
 msgstr ""
 "O que Ã© isso? Isso Ã© um elefante sendo comido por uma cobra, Ã© claro.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "NÃ£o foi possÃvel ler a lista fontes"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "mas %s serÃ¡ instalado."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "mas %s estÃ¡ instalado e Ã© mantido."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "mas %s estÃ¡ instalado."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "mas nÃ£o Ã© instalÃ¡vel."
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " o qual Ã© um pacote virtual."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " ou"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Os pacotes a seguir estÃ£o QUEBRADOS :"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Os pacotes a seguir nÃ£o estÃ£o sendo utilizados e serÃ£o REMOVIDOS:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Os pacotes a seguir foram automaticamente mantidos:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Os NOVOS pacotes a seguir serÃ£o automaticamente instalados:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Os pacotes a seguir serÃ£o automaticamente REMOVIDOS:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os pacotes a seguir serÃ£o REBAIXADOS (de versÃ£o):"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Os pacotes a seguir foram mantidos:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Os pacotes a seguir serÃ£o REINSTALADOS:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Os NOVOS pacotes a seguir serÃ£o instalados:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Os pacotes a seguir serÃ£o REMOVIDOS:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Os pacotes a seguir serÃ£o atualizados:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Os pacotes ESSENCIAIS a seguir serÃ£o REMOVIDOS!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Os pacotes ESSENCIAIS a seguir ficarÃ£o QUEBRADOS por esta aÃ§Ã£o:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -604,102 +609,231 @@
 "quebre\n"
 "        NÃƒO continue a menos que vocÃª saiba EXATAMENTE o que estÃ¡ fazendo!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Estou ciente de que essa Ã© um idÃ©ia muito ruim."
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Para continuar, digite a frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Sim"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "NÃ£o"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Para continuar, digite a frase \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Os pacotes a seguir foram RECOMENDADOS mas NÃƒO serÃ£o instalados:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Os pacotes a seguir foram SUGERIDOS mas NÃƒO serÃ£o instalados:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nenhum pacote serÃ¡ instalado, atualizado ou removido.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pacotes atualizados, %lu novos instalados, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu rebaixados, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a serem removidos e %lu nÃ£o atualizados.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Ã‰ preciso obter %sB/%sB de arquivos. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Ã‰ preciso obter %sB de arquivos. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Depois do desempacotamento, %sB serÃ£o usados.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Depois do desempacotamento, %sB serÃ£o liberados.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Caracter de aÃ§Ã£o ruim '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Nenhum pacote a ser exibido -- informe os nomes dos pacotes na linha apÃ³s "
 "'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Pressione Enter para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nenhum pacote encontrado -- informe os nomes dos pacotes na linha apÃ³s 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Pressione Enter para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "O formato de exibiÃ§Ã£o para visÃµes de pacotes"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Instalar/remover pacotes"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Os NOVOS pacotes a seguir serÃ£o automaticamente instalados:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Instalar/remover pacotes"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^F Esquecer novos pacotes"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Manter pacotes na versÃ£o atual\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+" markauto     - Marcar pacotes como tendo sido automaticamente instalados\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+" unmarkauto   - Marcar pacotes como tendo sido manualmente instalados\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "recomenda"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "VocÃª deseja continuar? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -710,7 +844,7 @@
 "InformaÃ§Ã£o de dependÃªncia serÃ¡ exibida.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -721,7 +855,7 @@
 "InformaÃ§Ã£o de dependÃªncia nÃ£o serÃ¡ exibida.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -732,7 +866,7 @@
 "VersÃµes serÃ£o exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -743,7 +877,7 @@
 "VersÃµes nÃ£o serÃ£o exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -754,7 +888,7 @@
 "MudanÃ§as de tamanho serÃ£o exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -765,131 +899,105 @@
 "MudanÃ§as de tamanho nÃ£o serÃ£o exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Comandos:\n"
-"  y : continua com a instalaÃ§Ã£o\n"
-"  n : aborta e finaliza\n"
-"  i : exibe informaÃ§Ã£o sobre um ou mais pacotes\n"
-"      os nomes dos pacotes devem seguir 'i'\n"
-"  c:  exibe os logs de mudanÃ§as Debian para um ou mais pacotes;\n"
-"      os nomes dos pacotes devem seguir 'c'\n"
-"  d : habilita exibiÃ§Ã£o de informaÃ§Ã£o de dependÃªncia\n"
-"  s : habilita exibiÃ§Ã£o de mudanÃ§as no tamanho de pacotes\n"
-"  v : habilita exibiÃ§Ã£o de versÃµes\n"
-"  e : entra na interface completamente visual\n"
-"\n"
-"  VocÃª tambÃ©m pode especificar modificaÃ§Ãµes para o conjunto de aÃ§Ãµes de\n"
-"  pacotes. Para fazÃª-lo, digite um caracter de aÃ§Ã£o seguido por um ou\n"
-"  mais nomes de pacotes ou padrÃµes. A aÃ§Ã£o serÃ¡ aplicada a todos os\n"
-"  pacotes. (VocÃª pode especificar aÃ§Ãµes adicionais; cada aÃ§Ã£o serÃ¡\n"
-"  aplicada a todos os pacotes que a seguirem)\n"
-"\n"
-"AÃ§Ãµes :\n"
-"  + : Instalar\n"
-"  - : Remover\n"
-"  _ : Expurgar\n"
-"  = : Manter\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Resposta invÃ¡lida. Por favor, informe um comando vÃ¡lido ou '?' para ajuda.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Sair do programa"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, 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:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Os pacotes a seguir estÃ£o QUEBRADOS :"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Erro ao gravar o arquivo de estado"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, 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:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, 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:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1186,7 +1294,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Apagando arquivos baixados obsoletos"
 
@@ -1476,27 +1584,22 @@
 "NÃ£o foi possÃvel corrigir as dependÃªncias, alguns pacotes nÃ£o puderam ser "
 "instalados"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes nÃ£o pÃ´de ser lida."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "As listas de pacote ou o arquivo de estado nÃ£o pode ser interpretado ou "
 "aberto."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "VocÃª precisa atualizar as listas de pacotes para corrigir esses arquivos que "
 "faltam"
 
-#: 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/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1779,17 +1882,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo de polÃtica de ordenaÃ§Ã£o '%s' invÃ¡lido"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilado em %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1798,7 +1901,7 @@
 "\n"
 "VersÃ£o NCurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1807,22 +1910,22 @@
 "\n"
 "VersÃ£o Curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "versÃ£o libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Uso: aptitude [-S frame] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opÃ§Ãµes] <aÃ§Ã£o> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1832,44 +1935,44 @@
 "interativo):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Instalar/atualizar pacotes\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Remover pacotes\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Remover pacotes e seus arquivos de configuraÃ§Ã£o\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Manter pacotes na versÃ£o atual\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Cancelar o comando hold para um pacote\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 " markauto     - Marcar pacotes como tendo sido automaticamente instalados\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 " unmarkauto   - Marcar pacotes como tendo sido manualmente instalados\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1878,18 +1981,18 @@
 " forbid-version - Proibir o aptitude de atualizar para uma versÃ£o especÃfica "
 "do pacote.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 " update       - Fazer o download das listas de pacotes novos/atualizados\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Executar uma atualizaÃ§Ã£o segura\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1898,57 +2001,57 @@
 " dist-upgrade - Executar uma atualizaÃ§Ã£o, posivelmente instalando e "
 "removendo pacotes\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Esquecer quais pacotes sÃ£o \"novos\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Procurar por um pacote por nome e/ou expressÃ£o\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Exibe informaÃ§Ãµes detalhadas sobre um pacote\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Apagar arquivos de pacotes baixados\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Apagar arquivos de pacotes baixados antigos\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Visualiza o log de mudanÃ§as de um pacote\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Fazer o download do arquivo .deb de um pacote\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  OpÃ§Ãµes:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Este texto de ajuda\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simular aÃ§Ãµes mas nÃ£o executÃ¡-las de verdade.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1956,12 +2059,12 @@
 " -d             Somente fazer o download de pacotes, nÃ£o instalar ou remover "
 "nada.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Sempre pedir por confirmaÃ§Ã£o ou aÃ§Ãµes\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1969,7 +2072,7 @@
 " -y             Assumir que a resposta para perguntas sim/nÃ£o simples seja "
 "'sim'\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1978,7 +2081,7 @@
 " -F formato      Especificar um formato para exibiÃ§Ã£o dos resultados da "
 "busca; veja o manual\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1986,7 +2089,7 @@
 " -O ordem       Especificar como resultados de buscas devem ser ordenados; \n"
 "consulte o manual\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -1994,17 +2097,17 @@
 " -w largura      Especificar a largura de exibiÃ§Ã£o para formatar resultados "
 "de busca\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Tentar agressivamente corrigir pacotes quebrados.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Exibir quais versÃµes de pacotes serÃ£o instaladas.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -2012,12 +2115,12 @@
 " -D             Exibir as dependÃªncias dos pacotes modificados "
 "automaticamente.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Exibir a mudanÃ§a no tamanho instalado de cada pacote.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -2025,7 +2128,7 @@
 " -v             Exibir informaÃ§Ã£o extra. (pode ser fonecido mÃºltiplas "
 "vezes)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -2033,14 +2136,14 @@
 " -t [release]   Definir de qual distribuiÃ§Ã£o os pacotes devem ser "
 "instalados\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 "-o chave=valor     Definir diretamente a opÃ§Ã£o de configuraÃ§Ã£o chamada "
 "'chave'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2049,65 +2152,65 @@
 " --with(out)-recommends\tEspecificar se as recomendaÃ§Ã£oes devem ou nÃ£o ser\n"
 "                tratadas como dependÃªncias fortes\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname: Ler a informaÃ§Ã£o de estado extendido do aptitude de fname.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Fazer download de novas lista de pacotes ao iniciar.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Executar uma execuÃ§Ã£o de instalaÃ§Ã£o ao iniciar.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Este aptitude nÃ£o contÃ©m Poderes de Super Vaca.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o requer um argumento na forma chave=valor, obtido %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ESTRANHEZA: opÃ§Ã£o de cÃ³digo desconhecida recebida\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Somente uma das opÃ§Ãµes -u e -i pode ser especificada\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u e -i nÃ£o podem ser especificadas em modo de linha de comando(ex. com "
 "'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u e -i nÃ£o podem ser especificados com um comando"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Comando desconhecido \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2138,7 +2241,7 @@
 msgid "Lost"
 msgstr "Perdeu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Campo Minado"
 
@@ -2316,7 +2419,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pacote"
 
@@ -3797,53 +3900,53 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Opa, nenhum erro aconteceu, isto nÃ£o deveria ter acontecido.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Procurar por: "
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "VocÃª jÃ¡ Ã© root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Subprocesso saiu com um erro -- vocÃª informou sua senha corretamente?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Carregando cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Realmente sair do Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Realmente descartar suas configuraÃ§Ãµes pessoais e recarregar as padrÃµes?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pacotes"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Visualizar os pacotes disponÃveis e escolher as aÃ§Ãµes a executar"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3859,15 +3962,15 @@
 "veja 'licenÃ§a' no menu Ajuda. Este Ã© um software livre e vocÃª Ã© encorajado \n"
 "a redistribuÃ-lo sob certas condiÃ§Ãµes; veja a 'licenÃ§a' para detalhes."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3875,45 +3978,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continuar"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "PrevisÃ£o da instalaÃ§Ã£o de pacotes"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^P Anterior"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns pacotes estavam quebrados e foram consertados"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3922,24 +4025,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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Tornar-se root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "NÃ£o tornar-se root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3952,7 +4055,7 @@
 "los.\n"
 "Digite \"U\" para preparar uma atualizaÃ§Ã£o."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3962,101 +4065,114 @@
 "vocÃª\n"
 " atualmente nÃ£o possui. VocÃª gostaria de mudar para a conta de root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Apagando arquivos baixados"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Arquivos de pacotes baixados foram apagados"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, 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:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, 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:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "NÃ£o foi possÃvel abrir %s para gravaÃ§Ã£o"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Instalar/remover pacotes"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Executar todas as instalaÃ§Ãµes e remoÃ§Ãµes pendentes"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^U Atualizar a lista de pacotes"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Checar por novas versÃµes de pacotes"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^F Esquecer novos pacotes"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer quais pacotes sÃ£o \"novos\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^C Limpar cache de pacotes"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Apagar arquivos de pacotes que foram previamente baixados"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Limpar arquivos ^obsoletos"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "^U Marcar AtualizÃ¡veis"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^P Jogar Campo Minado"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^B Tornar-se root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4065,70 +4181,70 @@
 "Executar 'su' para tornar-se root. Isto irÃ¡ reiniciar o programa, mas\n"
 " suas configuraÃ§Ãµes serÃ£o preservadas"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Recarregar cache de pacotes"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Recarregar o cache de pacotes"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Q Finalizar"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 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:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Remover"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o pacote atualmente selecionado para remoÃ§Ã£o"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "Ex^purgar"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^K Manter"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar quaisquer aÃ§Ãµes nos pacotes selecionados"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^H Mantido"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4136,11 +4252,11 @@
 "Cancelar quaisquer aÃ§Ãµes nos pacotes selecionados e protegÃª-los de "
 "atualizaÃ§Ãµes futuras"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Marcar ^Auto"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4149,11 +4265,11 @@
 "Marcar o pacote selecionado como tendo sido automaticamente instalado;\n"
 "ele serÃ¡ automaticamente removido caso nenhum outro pacote dependa dele"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Marcar ^Manual"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4162,11 +4278,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:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^F Proibir VersÃ£o"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4175,205 +4291,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:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformaÃ§Ã£o"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Exibir maiores informaÃ§Ãµes sobre o pacote selecionado"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^C Log de mudanÃ§as"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Exibir o log de mudanÃ§as Debian do pacote selecionado"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^F Encontrar"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Procurar por um pacote"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "^A Procurar Novamente"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Repetir a Ãºltima procura"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Limitar ExibiÃ§Ã£o"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "^Aplicar um filtro Ã  lista de pacotes"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^U Deslimitar ExibiÃ§Ã£o"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Remover o filtro da lista de pacotes"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "^B Encontrar Quebrado"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontra o prÃ³ximo pacote com dependÃªncias nÃ£o satisfeitas"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^U OpÃ§Ãµes da interface"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Muda as configuraÃ§Ãµes que afetam a interface do usuÃ¡rio"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "Gerencimento de ^DependÃªncias"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^MiscelÃ¢nea"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Muda as configuraÃ§Ãµes miscelÃ¢nicas do programa"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Reverter as opÃ§Ãµes"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Reverte todas as configuraÃ§Ãµes para os padrÃµes do sistema"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^N PrÃ³ximo"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Visualizar prÃ³xima tela"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^P Anterior"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Visualizar tela anterior"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^C Fechar"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Fechar esta tela"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Nova ^VisÃ£o de Pacote"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Criar uma nova visÃ£o de pacote padrÃ£o"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "^B Novo Navegador de Categorias"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Navega pelos pacotes por categoria"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^A Sobre"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Visualiza informaÃ§Ãµes sobre este programa"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^H Ajuda"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Visualizar a ajuda on-line"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Manual do UsuÃ¡rio"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Visualizar o manual do programa detalhado"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Visualizar uma lista de perguntas feitas frequentemente"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, 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:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^LicenÃ§a"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "AÃ§Ãµes"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Procurar"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "OpÃ§Ãµes"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "VisÃµes"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4381,11 +4497,11 @@
 "%s: Menu %s: Ajuda %s: Finaliza %s: Atualiza %s: Baixar/Instalar/Remover "
 "Pcts."
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "s"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
@@ -4427,13 +4543,55 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ai! Recebi um SIGQUIT, morrendo..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Sim"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "NÃ£o"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Comandos:\n"
+#~ "  y : continua com a instalaÃ§Ã£o\n"
+#~ "  n : aborta e finaliza\n"
+#~ "  i : exibe informaÃ§Ã£o sobre um ou mais pacotes\n"
+#~ "      os nomes dos pacotes devem seguir 'i'\n"
+#~ "  c:  exibe os logs de mudanÃ§as Debian para um ou mais pacotes;\n"
+#~ "      os nomes dos pacotes devem seguir 'c'\n"
+#~ "  d : habilita exibiÃ§Ã£o de informaÃ§Ã£o de dependÃªncia\n"
+#~ "  s : habilita exibiÃ§Ã£o de mudanÃ§as no tamanho de pacotes\n"
+#~ "  v : habilita exibiÃ§Ã£o de versÃµes\n"
+#~ "  e : entra na interface completamente visual\n"
+#~ "\n"
+#~ "  VocÃª tambÃ©m pode especificar modificaÃ§Ãµes para o conjunto de aÃ§Ãµes de\n"
+#~ "  pacotes. Para fazÃª-lo, digite um caracter de aÃ§Ã£o seguido por um ou\n"
+#~ "  mais nomes de pacotes ou padrÃµes. A aÃ§Ã£o serÃ¡ aplicada a todos os\n"
+#~ "  pacotes. (VocÃª pode especificar aÃ§Ãµes adicionais; cada aÃ§Ã£o serÃ¡\n"
+#~ "  aplicada a todos os pacotes que a seguirem)\n"
+#~ "\n"
+#~ "AÃ§Ãµes :\n"
+#~ "  + : Instalar\n"
+#~ "  - : Remover\n"
+#~ "  _ : Expurgar\n"
+#~ "  = : Manter\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 2005
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_ro\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-11-16 15:50+0200\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
 "Language-Team: Romanian <romanian>\n"
@@ -161,7 +161,7 @@
 msgstr "Automat ÅŸterge pachetele nefolosite care se potrivesc cu acest filtru"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -304,48 +304,48 @@
 "NotÄƒ: alegerea \"%s\" Ã®n locul\n"
 "      pachetului virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s este deja instalat cu versiunea cerutÄƒ (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s nu este instalat Ã®n momentul de faÅ£Äƒ, astfel Ã®ncÃ¢t nu va fi reinstalat.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Pachetul %s nu este instalat, astfel Ã®ncÃ¢t nu va fi ÅŸters\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pachetul %s nu este instalat, nu se poate interzice o Ã®nnoire\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pachetul %s nu poate fi Ã®nnoit, nu se poate interzice o Ã®nnoire\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "NotÄƒ: alegerea sarcinii \"%s: %s\" pentru instalare\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "PuteÅ£i specifica o versiune de pachet doar cu comanda 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "PuteÅ£i specifica o arhivÄƒ de pachet doar cu comanda 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -354,7 +354,7 @@
 "Nu pot gÄƒsi pachetul \"%s\", ÅŸi mai mult de 40 de\n"
 "pachete conÅ£in \"%s\" Ã®n nume.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -363,14 +363,14 @@
 "Nu pot gÄƒsi pachetul \"%s\".  Oricum, urmÄƒtoarele\n"
 "pachete conÅ£in \"%s\" Ã®n numele lor:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Nu pot gÄƒsi nici un pachet al cÄƒrui nume sau descriere sÄƒ se potriveascÄƒ cu "
 "\"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -380,7 +380,7 @@
 "40\n"
 "de pachete conÅ£in \"%s\" Ã®n descrierea lor.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -390,6 +390,11 @@
 "urmÄƒtoarele\n"
 "pachete conÅ£in \"%s\" Ã®n descrierea lor:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Caracter de acÅ£iune necorespunzÄƒtor '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Nu pot executa sensible-pager, este Äƒsta un sistem Debian funcÅ£ional?"
@@ -430,7 +435,7 @@
 msgid "Invalid operation %s"
 msgstr "OperaÅ£iune necorespunzÄƒtoare %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -441,16 +446,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "descÄƒrcare: trebuie specificat cel puÅ£in un pachet pentru descÄƒrcare\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Nu pot citi lista sursÄƒ"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Nu pot gÄƒsi pachetul numit \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -505,96 +510,96 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Ce este? Este un elefant mÃ¢ncat de un ÅŸarpe, bineÃ®nÅ£eles.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Nu pot citi lista surselor"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "dar %s e pe cale sÄƒ fie instalat."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "dar %s este instalat ÅŸi este pÄƒstrat."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "dar %s este instalat."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "dar nu este instalabil"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr "care este un pachet virtual."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr "sau"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "UrmÄƒtoarele pachete sunt DETERIORATE:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "UrmÄƒtoarele pachete sunt nefolosite ÅŸi vor fi ÅžTERSE:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "UrmÄƒtoarele pachete au fost automat pÄƒstrate:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "UrmÄƒtoarele pachete NOI vor fi automat instalate:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "UrmÄƒtoarele pachete vor fi automat ÅžTERSE:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "UrmÄƒtoarele pachete vor fi DE-GRADATE:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "UrmÄƒtoarele pachete au fost pÄƒstrate:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "UrmÄƒtoarele pachete vor fi REINSTALATE:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "UrmÄƒtoarele pachete NOI vor fi instalate:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "UrmÄƒtoarele pachete vor fi ÅžTERSE:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "UrmÄƒtoarele pachete vor fi Ã®nnoite:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "UrmÄƒtoarele pachete ESENÅ¢IALE vor fi ÅžTERSE!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "UrmÄƒtoarele pachete ESENÅ¢IALE se vor DETERIORA de cÄƒtre aceastÄƒ acÅ£iune:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -604,102 +609,229 @@
 "sistemului!\n"
 "           NU continuaÅ£i decÃ¢t dacÄƒ ÅŸtiÅ£i EXACT ce aveÅ£i de gÃ¢nd sÄƒ faceÅ£i!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Sunt conÅŸtient cÄƒ asta este o idee proastÄƒ"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Pentru a continua, tastaÅ£i fraza \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Da"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Nu"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Pentru a continua, tastaÅ£i fraza \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "UrmÄƒtoarele pachete sunt RECOMANDATE dar NU vor fi instalate:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "UrmÄƒtoarele pachete sunt SUGERATE dar NU vor fi instalate:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nici un pachet nu va fi instalat, Ã®nnoit sau ÅŸters.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pachete Ã®nnoite, %lu nou instalate, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalate, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu de-gradate, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu de ÅŸters ÅŸi %lu neÃ®nnoite.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Este nevoie de %sB/%sB de arhive. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Este nevoie de %sB de arhive. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "DupÄƒ despachetare %sB vor fi folosiÅ£i.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "DupÄƒ despachetare %sB vor fi eliberaÅ£i.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Caracter de acÅ£iune necorespunzÄƒtor '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Nici un pachet de arÄƒtat -- introduceÅ£i numele pachetului pe o linie dupÄƒ "
 "'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "ApÄƒsaÅ£i Enter pentru a continua."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nici un pachet gÄƒsit -- introduceÅ£i numele pachetului pe o linie dupÄƒ 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "ApÄƒsaÅ£i Enter pentru a continua."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Formatul de afiÅŸare pentru vizualizÄƒrile pachetelor"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^InstaleazÄƒ/ÅŸterge pachete"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "UrmÄƒtoarele pachete NOI vor fi automat instalate:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^InstaleazÄƒ/ÅŸterge pachete"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "UitÄƒ de noile pachete"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " reÅ£ine       - Pune pachetele Ã®n aÅŸteptare\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " auto-marcare     - MarcheazÄƒ pachetele ca fiind automat instalate\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " ne-auto-marcare   - MarcheazÄƒ pachetele ca fiind instalate manual\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "recomandÄƒ"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "VreÅ£i sÄƒ continuaÅ£i? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -710,7 +842,7 @@
 "InformaÅ£iile despre dependenÅ£e vor fi arÄƒtate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -721,7 +853,7 @@
 "InformaÅ£iile despre dependenÅ£e nu vor fi arÄƒtate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -732,7 +864,7 @@
 "Versiunile vor fi arÄƒtate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -743,7 +875,7 @@
 "Versiunile nu vor fi arÄƒtate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -754,7 +886,7 @@
 "SchimbÄƒrile de dimensiune vor fi arÄƒtate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -765,138 +897,108 @@
 "SchimbÄƒrile de dimensiune nu vor fi arÄƒtate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Comenzi:\n"
-"  y: continuÄƒ cu instalarea\n"
-"  n: abandoneazÄƒ ÅŸi ieÅŸi\n"
-"  i: aratÄƒ informaÅ£iile despre unul sau mai multe pachete;\n"
-"     numele pachetului trebuie sa urmeze dupÄƒ 'i'\n"
-"  c: aratÄƒ jurnalele de modificÄƒri Debian pentru unul sau mai multe "
-"pachete;\n"
-"     numele pachetului trebuie sÄƒ urmeze dupÄƒ 'c'\n"
-"  d: comutÄƒ afiÅŸarea informaÅ£ilor despre dependenÅ£e\n"
-"  s: comutÄƒ afiÅŸarea schimbÄƒrilor la dimensiunea pachetelor\n"
-"  v: comuta afiÅŸarea versiunii\n"
-"  e: intrÄƒ Ã®n interfaÅ£a complet vizualÄƒ\n"
-"\n"
-"  AÅ£i putea specifica deasemenea modificÄƒrile acÅ£iunilor setului de "
-"pachete.\n"
-"  Pentru a face aceasta, tastaÅ£i un caracter de acÅ£iune urmat de unul sau "
-"mai multe\n"
-"nume de pachete sau modele.  AcÅ£iunea se va aplica tuturor pachetelor. "
-"(puteÅ£i specifica\n"
-"acÅ£iuni adiacente; fiecare va fi aplicatÄƒ tuturor pachetelor care o "
-"urmeazÄƒ)\n"
-"\n"
-"AcÅ£iuni:\n"
-"  + : InstaleazÄƒ\n"
-"  - : Åžterge\n"
-"  _ : CurÄƒÅ£Äƒ\n"
-"  = : Å¢ine\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "RÄƒspuns nevalabil.  VÄƒ rog introduceÅ£i o comandÄƒ valabilÄƒ sau '?' pentru "
 "ajutor.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "IeÅŸire din program"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "UrmÄƒtoarele pachete n-au Ã®ndeplinit dependenÅ£ele:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "UrmÄƒtoarele pachete sunt DETERIORATE:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, 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
 #, 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:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, 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:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1191,7 +1293,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Åžtergere fiÅŸiere Ã®nvechite descÄƒrcate"
 
@@ -1481,26 +1583,21 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Nu pot sa corectez dependenÅ£ele, unele pachete nu pot fi instalate"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Lista cu sursele nu poate fi cititÄƒ."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Listele cu pachete sau fiÅŸierul de stÄƒri nu pot fi analizate sau deschise."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "AÅ£i putea dori sÄƒ actualizaÅ£i listele cu pachete pentru a corecta aceste "
 "fiÅŸiere lipsÄƒ"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Nu pot deschide %s pentru scriere"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1779,17 +1876,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tip nevalid de politicÄƒ de sortare '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilat la %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilator: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1798,7 +1895,7 @@
 "\n"
 "Versiune NCurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1807,22 +1904,22 @@
 "\n"
 "Versiune Curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "Versiune libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Utilizare: aptitude [-S fnume] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "        aptitude [opÅ£iuni] <acÅ£iune> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1832,42 +1929,42 @@
 "interactiv):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " instalare      - InstaleazÄƒ/Ã®nnoieÅŸte pachetele\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " ÅŸterge      - Åžterge pachetele\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " curÄƒÅ£Äƒ       - CurÄƒÅ£Äƒ pachetele ÅŸi fiÅŸierele lor de configurare\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " reÅ£ine       - Pune pachetele Ã®n aÅŸteptare\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " nereÅ£ine       - AnuleazÄƒ comanda de reÅ£inere pentru un pachet\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " auto-marcare     - MarcheazÄƒ pachetele ca fiind automat instalate\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " ne-auto-marcare   - MarcheazÄƒ pachetele ca fiind instalate manual\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1876,18 +1973,18 @@
 " versiune interzisÄƒ - Interzice aptitude de a Ã®nnoi o anumitÄƒ versiune de "
 "pachet.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 " actualizare       - DescarcÄƒ listele de pachete noi/posibil de Ã®nnoit\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " Ã®nnoire      - ExecutÄƒ o Ã®nnoire sigurÄƒ\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1895,70 +1992,70 @@
 msgstr ""
 " Ã®nnoire distribuÅ£ie - ExecutÄƒ o Ã®nnoire, instalÃ¢nd ÅŸi ÅŸtergÃ¢nd pachete\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " uitÄƒ de noi   - UitÄƒ ce pachete sunt \"noi\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " cautÄƒ      - CautÄƒ un pachet dupÄƒ nume ÅŸi/sau expresie\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " aratÄƒ       - AfiÅŸeazÄƒ informaÅ£ii detaliate despre un pachet\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " curÄƒÅ£Äƒ      - Åžterge fiÅŸierele pachetelor descÄƒrcate\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autocurÄƒÅ£are    - Åžterge vechile fiÅŸiere ale pachetelor descÄƒrcate\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 " jurnal de modificÄƒri    - Vizualizare jurnal de modificÄƒri al unui pachet\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr "descÄƒrcare     - DescarcÄƒ fiÅŸierul .deb pentru un pachet\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  OpÅ£iuni:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Acest text de ajutor\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s               SimuleazÄƒ acÅ£iunea, dar n-o executa Ã®n realitate.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d                Doar descarcÄƒ pachetele, nu instala sau ÅŸterge nimic.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P               ÃŽntodeauna cere confirmare pentru acÅ£iuni\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1966,7 +2063,7 @@
 " -y              Presupune cÄƒ rÄƒspunsul la Ã®ntrebÄƒrile simple da/nu este "
 "'da'\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1975,7 +2072,7 @@
 " -F format       SpecificÄƒ un format pentru afiÅŸarea rezultatelor cÄƒutÄƒrii; "
 "vezi manualul\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1983,7 +2080,7 @@
 " -O ordine        SpecificÄƒ modul Ã®n care rezultatele cÄƒutÄƒrii sÄƒ fie "
 "sortate; vezi manual\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -1991,28 +2088,28 @@
 " -w lÄƒÅ£ime         SpecificÄƒ lÄƒÅ£imea afiÅŸÄƒrii pentru formatarea rezultatului "
 "de cÄƒutare\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             ÃŽncearcÄƒ Ã®n mod agresiv sÄƒ repar pachetele.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             AratÄƒ ce versiuni de pachete sunt instalate.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             AratÄƒ dependenÅ£ele pachetelor schimbate automat.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    AratÄƒ modificarea dimensiunii fiecÄƒrui pachet instalat.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -2020,20 +2117,20 @@
 " -v             AfiÅŸeazÄƒ informaÅ£ii suplimentare (poate fi folositÄƒ de mai "
 "multe ori)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 " -t [producÅ£ie]   Impune producÅ£ia din care pachetele ar trebui instalate\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o key=val     AjusteazÄƒ direct opÅ£iunea de configurare numitÄƒ 'key'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2043,64 +2140,64 @@
 "dependenÅ£e\n"
 ".......................puternice sau nu\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fnume: CiteÅŸte informaÅ£iile de stare extinsÄƒ aptitude din fnume.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : DescarcÄƒ listele cu pachetele noi la pornire.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : ExecutÄƒ comanda de instalare la pornire\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                   Acest aptitude n-are puterile unei Super Vaci.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o necesitÄƒ un argument de forma key=valoare, primit %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "CIUDÄ‚Å¢ENIE: primit cod opÅ£iune necunoscut\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Doar unul din -u ÅŸi -i poate fi specificat\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u ÅŸi -i pot sÄƒ nu fie specificaÅ£i Ã®n modul linie de comandÄƒ (ex., cu "
 "'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u ÅŸi -i pot sÄƒ nu fie specificaÅ£i cu o comandÄƒ"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "ComandÄƒ necunoscutÄƒ \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2131,7 +2228,7 @@
 msgid "Lost"
 msgstr "Pierdut"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Detector de mine"
 
@@ -2308,7 +2405,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pachet"
 
@@ -3790,52 +3887,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Ah, nu sunt deloc erori, asta n-ar fi trebuit sa se Ã®ntÃ¢mple..."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "CÄƒutare pentru:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "SunteÅ£i deja root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Subproces terminat cu eroare -- aÅ£i tastat corect parola?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "ÃŽncÄƒrcare cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Chiar pÄƒrÄƒsiÅ£i Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Chiar renunÅ£aÅ£i la setÄƒrile personale ÅŸi reÃ®ncÄƒrcaÅ£i cele implicite?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Pachete"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "VizualizaÅ£i pachetele disponibile ÅŸi alegeÅ£i acÅ£iunile de executat"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3853,15 +3950,15 @@
 "redistribuiÅ£i\n"
 "Ã®n anumite condiÅ£ii; vedeÅ£i 'licenÅ£a' pentru detalii."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "CITEÅžTE-MÄ‚"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3869,45 +3966,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "ContinuÄƒ"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "PrevizualizeazÄƒ pachetele instalate"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^Precedent"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Unele pachete au fost deteriorate ÅŸi s-au reparat"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3916,25 +4013,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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Devin root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Nu devin root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3946,7 +4043,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:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3956,101 +4053,114 @@
 "ce\n"
 "n-aveÅ£i acum.  VreÅ£i sÄƒ schimb cÄƒtre contul de root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Åžtergere fiÅŸiere descÄƒrcate"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "FiÅŸierele pachetelor descÄƒrcate au fost ÅŸterse"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, 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:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, 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:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Nu pot deschide %s pentru scriere"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^InstaleazÄƒ/ÅŸterge pachete"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "ExecutÄƒ toate instalÄƒrile ÅŸi ÅŸtergerile nerezolvate"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "Act^ualizeazÄƒ lista de pachete"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Verificare pentru noi versiuni de pachete"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "UitÄƒ de noile pachete"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "UitÄƒ de pachetele care sunt \"noi\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^CurÄƒÅ£Äƒ cache-ul pachetului"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Åžterge fiÅŸierele pachetelor care-au fost anterior descÄƒrcate"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "CurÄƒÅ£Äƒ fiÅŸierele Ã®nvechite"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 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:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "MarcheazÄƒ ca posibil de Ã®nnoit"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "JoacÄƒ Detectorul de Mine"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Devenire root"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4059,70 +4169,70 @@
 "ExecutÄƒ 'su' pentru a deveni root; asta va reporni programul, dar\n"
 "setÄƒrile dvs. vor fi pÄƒstrate"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^ReÃ®ncarcÄƒ cache-ul pachetului"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "ReÃ®ncÄƒrcare cache-ul pachetului"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "IeÅŸire"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "IeÅŸire din program"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "RenunÅ£Äƒ"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^InstaleazÄƒ"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "SemnalizeazÄƒ pachetul curent selectat pentru instalare sau Ã®nnoire"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "Åžte^rge"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "SemnalizeazÄƒ pachetul curent selectat pentru ÅŸtergere"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "CurÄƒÅ£Äƒ"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "Å¢ine"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "AnuleazÄƒ orice acÅ£iune pentru pachetul selectat"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "ReÅ£ine"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4130,11 +4240,11 @@
 "AnuleazÄƒ orice acÅ£iune pentru pachetul selectat, ÅŸi protejeazÄƒ-l de viitoare "
 "Ã®nnoiri"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "MarcheazÄƒ ^automat"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4143,11 +4253,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:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "MarcheazÄƒ ^manual"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4156,11 +4266,11 @@
 "MarcheazÄƒ pachetul selectat ca fiind instalat manual;\n"
 "nu va fi ÅŸters decÃ¢t dacÄƒ Ã®l veÅ£i ÅŸterge manual"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "Interzice versiunea"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4169,205 +4279,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:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformaÅ£ii"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "AfiÅŸeazÄƒ mai multe informaÅ£ii despre pachetul selectat"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "Jurnal de modifi^cÄƒri"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "AfiÅŸeazÄƒ jurnalul de modificÄƒri Debian pentru pachetul selectat"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "GÄƒseÅŸte"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "CÄƒutarea unui pachet"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Mai gÄƒseÅŸte od^atÄƒ"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "RepetÄƒ ultima cÄƒutare"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^LimiteazÄƒ afiÅŸajul"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "AplicÄƒ un filtru listei de pachete"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "NelimiteazÄƒ afiÅŸajul"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Åžterge filtrul din lista de pachete"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "GÄƒseÅŸte deteriorat"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "GÄƒseÅŸte urmÄƒtorul pachet cu dependenÅ£e nesatisfÄƒcute"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "OpÅ£iuni interfaÅ£Äƒ ^utilizator"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "SchimbÄƒ ajustÄƒrile ce afecteazÄƒ interfaÅ£a utilizatorului"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "Manevrarea ^dependenÅ£elor"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "Diverse"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "SchimbÄƒ diverse ajustÄƒri ale programului"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Revenire opÅ£iuni"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Refacere toate ajustÄƒrile la cele implicite ale sistemului"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "UrmÄƒtorul"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Vizualizare urmÄƒtorul afiÅŸaj"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Precedent"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Vizualizare afiÅŸaj precedent"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "ÃŽn^chide"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "ÃŽnchide acest afiÅŸaj"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "NouÄƒ ^vizualizare pachet"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Crearea unei noi vizualizÄƒri de pachet implicite"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "NouÄƒ rÄƒsfoire de categorii"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "RÄƒsfoieÅŸte pachetele dupÄƒ categorie"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "Despre"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Vizualizare informaÅ£ii despre acest program"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "Ajutor"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Vizualizare ajutor Ã®n direct"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Manual de utilizare"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Vizualizarea manualului detaliat al programului"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "ÃŽntrebÄƒri ^frecvente"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Vizualizare listÄƒ de Ã®ntrebÄƒri frecvente"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, 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:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^LicenÅ£Äƒ"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 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:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "AcÅ£iuni"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "CÄƒutare"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "OpÅ£iuni"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "VizualizÄƒri"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Ajutor"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4375,11 +4485,11 @@
 "%s: Meniu  %s: Ajutor  %s: IeÅŸire  %s: Actualizare  %s: DescÄƒrcare/Instalare/"
 "Åžtergere pachete"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
@@ -4423,13 +4533,59 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Aoleeu!  Am primit SIGHQUIT, mooooor...\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Da"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Nu"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Comenzi:\n"
+#~ "  y: continuÄƒ cu instalarea\n"
+#~ "  n: abandoneazÄƒ ÅŸi ieÅŸi\n"
+#~ "  i: aratÄƒ informaÅ£iile despre unul sau mai multe pachete;\n"
+#~ "     numele pachetului trebuie sa urmeze dupÄƒ 'i'\n"
+#~ "  c: aratÄƒ jurnalele de modificÄƒri Debian pentru unul sau mai multe "
+#~ "pachete;\n"
+#~ "     numele pachetului trebuie sÄƒ urmeze dupÄƒ 'c'\n"
+#~ "  d: comutÄƒ afiÅŸarea informaÅ£ilor despre dependenÅ£e\n"
+#~ "  s: comutÄƒ afiÅŸarea schimbÄƒrilor la dimensiunea pachetelor\n"
+#~ "  v: comuta afiÅŸarea versiunii\n"
+#~ "  e: intrÄƒ Ã®n interfaÅ£a complet vizualÄƒ\n"
+#~ "\n"
+#~ "  AÅ£i putea specifica deasemenea modificÄƒrile acÅ£iunilor setului de "
+#~ "pachete.\n"
+#~ "  Pentru a face aceasta, tastaÅ£i un caracter de acÅ£iune urmat de unul sau "
+#~ "mai multe\n"
+#~ "nume de pachete sau modele.  AcÅ£iunea se va aplica tuturor pachetelor. "
+#~ "(puteÅ£i specifica\n"
+#~ "acÅ£iuni adiacente; fiecare va fi aplicatÄƒ tuturor pachetelor care o "
+#~ "urmeazÄƒ)\n"
+#~ "\n"
+#~ "AcÅ£iuni:\n"
+#~ "  + : InstaleazÄƒ\n"
+#~ "  - : Åžterge\n"
+#~ "  _ : CurÄƒÅ£Äƒ\n"
+#~ "  = : Å¢ine\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 2005
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: aptitude_ru\n"
 "Report-Msgid-Bugs-To: submit at bugs.debian.org\n"
-"POT-Creation-Date: 2005-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-09-27 22:47+0200\n"
 "Last-Translator: Yuriy Talakan' <yt at amur.elektra.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -161,7 +161,7 @@
 "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ Ð½ÐµÐ¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹, Ð¿Ð¾Ð´Ñ…Ð¾Ð´ÑÑ‰Ð¸Ðµ Ð¿Ð¾Ð´ ÑÑ‚Ð¾Ñ‚ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -304,47 +304,47 @@
 "Ð—Ð°Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ: Ð²Ñ‹Ð±Ñ€Ð°Ð½ \"%s\" Ð²Ð¼ÐµÑÑ‚Ð¾\n"
 "           Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ð°ÐºÐµÑ‚Ð° \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s ÑƒÐ¶Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð¾Ð¹ Ð²ÐµÑ€ÑÐ¸Ð¸ (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "ÐŸÐ°ÐºÐµÑ‚ %s Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»Ñ‘Ð½\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "ÐŸÐ°ÐºÐµÑ‚ %s Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ñ‘Ð½ Ðº Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑŽ\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "ÐŸÐ°ÐºÐµÑ‚ %s Ð½Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÐµÐ¼Ñ‹Ð¹, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Ð—Ð°Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ: Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð° Ð·Ð°Ð´Ð°Ñ‡Ð° \"%s: %s\" Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð²ÐµÑ€ÑÐ¸ÑŽ Ð¿Ð°ÐºÐµÑ‚Ð° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð°Ñ€Ñ…Ð¸Ð² Ð¿Ð°ÐºÐµÑ‚Ð° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -353,7 +353,7 @@
 "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚ \"%s\", Ð¸ Ð±Ð¾Ð»ÐµÐµ Ñ‡ÐµÐ¼ 40\n"
 "Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ \"%s\" Ð² ÑÐ²Ð¾Ñ‘Ð¼ Ð¸Ð¼ÐµÐ½Ð¸.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -362,13 +362,13 @@
 "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚ \"%s\". ÐžÐ´Ð½Ð°ÐºÐ¾, ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ\n"
 "Ð¿Ð°ÐºÐµÑ‚Ñ‹ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ \"%s\" Ð² ÑÐ²Ð¾Ñ‘Ð¼ Ð¸Ð¼ÐµÐ½Ð¸:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚Ñ‹, ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð¸Ñ… \"%s\" Ð² ÑÐ²Ð¾Ñ‘Ð¼ Ð¸Ð¼ÐµÐ½Ð¸ Ð¸Ð»Ð¸ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¸\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -377,7 +377,7 @@
 "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚ Ð¸Ð¼ÐµÑŽÑ‰Ð¸Ð¹ \"%s\", Ð¸ Ð±Ð¾Ð»ÐµÐµ Ñ‡ÐµÐ¼ 40\n"
 "Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ \"%s\" Ð² ÑÐ²Ð¾Ñ‘Ð¼ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¸.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -386,6 +386,11 @@
 "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚ Ð¸Ð¼ÐµÑŽÑ‰Ð¸Ð¹ \"%s\".ÐžÐ´Ð½Ð°ÐºÐ¾, ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ\n"
 "Ð¿Ð°ÐºÐµÑ‚Ñ‹ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‚ \"%s\" Ð² ÑÐ²Ð¾Ñ‘Ð¼ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¸.\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ ÑÐ¸Ð¼Ð²Ð¾Ð» '%c' Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -427,7 +432,7 @@
 msgid "Invalid operation %s"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -438,16 +443,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°: Ð²Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ Ð¾Ð´Ð¸Ð½ Ð¿Ð°ÐºÐµÑ‚ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» sources.list"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚, Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -502,97 +507,97 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Ð§Ñ‚Ð¾ ÑÑ‚Ð¾? ÐÑ‚Ð¾ ÑÐ»Ð¾Ð½, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾Ð³Ð»Ð¾Ñ‚Ð¸Ð»Ð° Ð·Ð¼ÐµÑ, ÐºÐ¾Ð½ÐµÑ‡Ð½Ð¾.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¿Ñ€Ð¾Ñ‡ÐµÑÑ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¸ÑÑ‚Ð¾Ñ‡Ð½Ð¸ÐºÐ¾Ð²"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ‚ÑÑ %s."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ %s Ð¸ ÑƒÐ´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ %s "
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "Ð½Ð¾ ÐµÐ³Ð¾ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¼ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " Ð¸Ð»Ð¸"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ ÐÐ•Ð ÐÐ‘ÐžÐ¢ÐžÐ¡ÐŸÐžÐ¡ÐžÐ‘ÐÐ«:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr " Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑŽÑ‚ÑÑ Ð¸ Ð±ÑƒÐ´ÑƒÑ‚ Ð£Ð”ÐÐ›Ð•ÐÐ«:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ñ‹:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ ÐÐžÐ’Ð«Ð• Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð£Ð”ÐÐ›Ð•ÐÐ«:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð—ÐÐœÐ•ÐÐ•ÐÐ« ÐÐ Ð‘ÐžÐ›Ð•Ð• Ð¡Ð¢ÐÐ Ð«Ð•:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ñ‹ Ð½Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ ÐŸÐ•Ð Ð•Ð£Ð¡Ð¢ÐÐÐžÐ’Ð›Ð•ÐÐ«:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ ÐÐžÐ’Ð«Ð• Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð£Ð”ÐÐ›Ð•ÐÐ«:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ ÐŸÐ•Ð Ð’ÐžÐ™ ÐÐ•ÐžÐ‘Ð¥ÐžÐ”Ð˜ÐœÐžÐ¡Ð¢Ð˜ Ð±ÑƒÐ´ÑƒÑ‚ Ð£Ð”ÐÐ›Ð•ÐÐ«!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ ÐŸÐ•Ð Ð’ÐžÐ™ ÐÐ•ÐžÐ‘Ð¥ÐžÐ”Ð˜ÐœÐžÐ¡Ð¢Ð˜ ÑÑ‚Ð°Ð½ÑƒÑ‚ ÐÐ•Ð ÐÐ‘ÐžÐ¢ÐžÐ¡ÐŸÐžÐ¡ÐžÐ‘ÐÐ« Ð¸Ð·-Ð·Ð° ÑÑ‚Ð¾Ð³Ð¾ "
 "Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -601,101 +606,228 @@
 "ÐŸÐ Ð•Ð”Ð£ÐŸÐ Ð•Ð–Ð”Ð•ÐÐ˜Ð•: Ð’Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ ÑÑ‚Ð¾Ð³Ð¾ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ‚ Ð²Ð°ÑˆÑƒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ!\n"
 "         ÐžÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÐµÑÑŒ, ÐµÑÐ»Ð¸ Ð¢ÐžÐ§ÐÐž Ð½Ðµ Ð·Ð½Ð°ÐµÑ‚Ðµ, Ñ‡Ñ‚Ð¾ Ð´ÐµÐ»Ð°ÐµÑ‚Ðµ!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Ð¯ Ð·Ð½Ð°ÑŽ, Ñ‡Ñ‚Ð¾ ÑÑ‚Ð¾ Ð¾Ñ‡ÐµÐ½ÑŒ Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð¸Ð´ÐµÑ"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ, Ð½Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ñ€Ð°Ð·Ñƒ \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ð”Ð°"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "ÐÐµÑ‚"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Ð§Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ, Ð½Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ñ€Ð°Ð·Ñƒ \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 "Ð Ð•ÐšÐžÐœÐ•ÐÐ”Ð£Ð®Ð¢Ð¡Ð¯ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹, Ð½Ð¾ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¾Ð½Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹ ÐÐ• Ð‘Ð£Ð”Ð£Ð¢:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 "ÐŸÐ Ð•Ð”Ð›ÐÐ“ÐÐ®Ð¢Ð¡Ð¯ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹, Ð½Ð¾ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¾Ð½Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹ ÐÐ• Ð‘Ð£Ð”Ð£Ð¢:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "ÐÐ¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¿Ð°ÐºÐµÑ‚Ð° Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¸Ð»Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, %lu ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð½Ð¾Ð²Ñ‹Ñ…, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu Ð¿ÐµÑ€ÐµÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ‹ Ð½Ð° ÑÑ‚Ð°Ñ€Ñ‹Ðµ Ð²ÐµÑ€ÑÐ¸Ð¸, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ð¾ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ, Ð¸ %lu Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð½Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ %sB/%sB Ð°Ñ€Ñ…Ð¸Ð²Ð¾Ð². "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ %sB Ð°Ñ€Ñ…Ð¸Ð²Ð¾Ð². "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "ÐŸÐ¾ÑÐ»Ðµ Ñ€Ð°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ¸ %sB Ð±ÑƒÐ´ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚Ð¾.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "ÐŸÐ¾ÑÐ»Ðµ Ñ€Ð°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ¸ Ð¾ÑÐ²Ð¾Ð±Ð¾Ð´Ð¸Ñ‚ÑÑ %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ ÑÐ¸Ð¼Ð²Ð¾Ð» '%c' Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "ÐÐµÑ‚ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° -- Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ Ð¿Ð¾ÑÐ»Ðµ 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ Ð’Ð²Ð¾Ð´ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "ÐŸÐ°ÐºÐµÑ‚Ñ‹ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹ -- Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ Ð¿Ð¾ÑÐ»Ðµ 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ Ð’Ð²Ð¾Ð´ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚ Ð¾ÐºÐ¾Ð½ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ/ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ ÐÐžÐ’Ð«Ð• Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ/ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Ð—Ð°Ð±Ñ‹Ñ‚ÑŒ Ð¾ Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð°Ñ…"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Ð—Ð°Ñ„Ð¸ÐºÑÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚, Ñ‡Ñ‚Ð¾ Ð¾Ð½ Ð±Ñ‹Ð» ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚, Ñ‡Ñ‚Ð¾ Ð¾Ð½ Ð±Ñ‹Ð» ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -706,7 +838,7 @@
 "Ð‘ÑƒÐ´ÐµÑ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÑÑ….\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -717,7 +849,7 @@
 "ÐÐµ Ð±ÑƒÐ´ÐµÑ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÑÑ….\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +860,7 @@
 "Ð‘ÑƒÐ´ÐµÑ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ð²ÐµÑ€ÑÐ¸ÑÑ….\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -739,7 +871,7 @@
 "ÐÐµ Ð±ÑƒÐ´ÐµÑ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ð²ÐµÑ€ÑÐ¸ÑÑ….\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -750,7 +882,7 @@
 "Ð‘ÑƒÐ´ÐµÑ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¸ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð¾Ð².\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -761,128 +893,102 @@
 "ÐÐµ Ð±ÑƒÐ´ÐµÑ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒÑÑ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¸ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð¾Ð².\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹:\n"
-"  y: Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹\n"
-"  n: Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ Ð¸ Ð²Ñ‹Ð¹Ñ‚Ð¸\n"
-"  i: Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾Ð± Ð¾Ð´Ð½Ð¾Ð¼ Ð¸Ð»Ð¸ Ð±Ð¾Ð»ÐµÐµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
-"     Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾ÑÐ»Ðµ 'i'.\n"
-"  c: Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Debian changelog Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð»Ð¸ Ð±Ð¾Ð»ÐµÐµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²;\n"
-"     Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÑŽÑ‚ÑÑ Ð¿Ð¾ÑÐ»Ðµ 'c'\n"
-"  d: Ð²ÐºÐ»/Ð²Ñ‹ÐºÐ» Ð¿Ð¾ÐºÐ°Ð· Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÐµÐ¹\n"
-"  s: Ð²ÐºÐ»/Ð²Ñ‹ÐºÐ» Ð¿Ð¾ÐºÐ°Ð· Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
-"  v: Ð²ÐºÐ»/Ð²Ñ‹ÐºÐ» Ð¿Ð¾ÐºÐ°Ð· Ð²ÐµÑ€ÑÐ¸Ð¹\n"
-"  e: Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² Ð¿Ð¾Ð»Ð½Ñ‹Ð¹ Ð²Ð¸Ð·ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ\n"
-"\n"
-"  Ð¢Ð°ÐºÐ¶Ðµ Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸ÑÐ¼ Ð½Ð°Ð´ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð¼ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð².\n"
-"  Ð”Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾, Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð» Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¸ Ð·Ð° Ð½Ð¸Ð¼ Ð¾Ð´Ð½Ð¾ Ð¸ Ð±Ð¾Ð»ÐµÐµ Ð¸Ð¼Ñ‘Ð½ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
-"Ð¸Ð»Ð¸ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð². Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¾ ÐºÐ¾ Ð²ÑÐµÐ¼ Ð¿Ð°ÐºÐµÑ‚Ð°Ð¼. (Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð´Ð°Ñ‚ÑŒ\n"
-"Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ; ÐºÐ°Ð¶Ð´Ð¾Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¾ ÐºÐ¾ Ð²ÑÐµÐ¼ Ð¿Ð°ÐºÐµÑ‚Ð°Ð¼\n"
-"ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ Ð¿Ð¾ÑÐ»Ðµ Ð½ÐµÐ³Ð¾)\n"
-"\n"
-"Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ:\n"
-"  + : Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ\n"
-"  - : Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ\n"
-"  _ : Ð’Ñ‹Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ\n"
-"  = : Ð—Ð°Ñ„Ð¸ÐºÑÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¾Ñ‚Ð²ÐµÑ‚. Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼ÑƒÑŽ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð¸Ð»Ð¸ '?' Ð´Ð»Ñ ÑÐ¿Ñ€Ð°Ð²ÐºÐ¸.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ Ñ€Ð°Ð±Ð¾Ñ‚Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð¸Ð¼ÐµÑŽÑ‚ Ð½ÐµÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€Ñ‘Ð½Ð½Ñ‹Ðµ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ ÐÐ•Ð ÐÐ‘ÐžÐ¢ÐžÐ¡ÐŸÐžÐ¡ÐžÐ‘ÐÐ«:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸ÑÐ¸ Ñ„Ð°Ð¹Ð»Ð° ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ð¹"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¾Ñ‚Ð²ÐµÑ‚. Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼ÑƒÑŽ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð¸Ð»Ð¸ '?' Ð´Ð»Ñ ÑÐ¿Ñ€Ð°Ð²ÐºÐ¸.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¾Ñ‚Ð²ÐµÑ‚. Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼ÑƒÑŽ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ Ð¸Ð»Ð¸ '?' Ð´Ð»Ñ ÑÐ¿Ñ€Ð°Ð²ÐºÐ¸.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "Ð¿Ð¾Ð¸ÑÐº: Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð²Ð²ÐµÑÑ‚Ð¸ Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ Ð¾Ð´Ð½Ð¾ ÑÐ»Ð¾Ð²Ð¾\n"
@@ -1177,7 +1283,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ ÑƒÑÑ‚Ð°Ñ€ÐµÐ²ÑˆÐ¸Ñ… Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
@@ -1469,25 +1575,20 @@
 "ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ Ð¾Ñ‚ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸; Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ "
 "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ sources.list"
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ Ð¸Ð»Ð¸ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð¸Ð»Ð¸ Ñ„Ð°Ð¹Ð» ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ð¹."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ñ‹ Ð·Ð°Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÐºÐµÑ‚Ð¾Ð², Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð½Ðµ Ð±Ñ‹Ð»Ð¾ ÑÑ‚Ð¸Ñ… "
 "Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð½Ñ‹Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1758,17 +1859,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ‚Ð¸Ð¿ ÑÐ¾Ñ€Ñ‚Ð¸Ñ€ÑƒÑŽÑ‰ÐµÐ³Ð¾ Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð° '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s ÑÐºÐ¾Ð¼Ð¿Ð¸Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Ð² %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "ÐšÐ¾Ð¼Ð¿Ð¸Ð»ÑÑ‚Ð¾Ñ€: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1777,7 +1878,7 @@
 "\n"
 "Ð’ÐµÑ€ÑÐ¸Ñ NCurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1786,22 +1887,22 @@
 "\n"
 "Ð’ÐµÑ€ÑÐ¸Ñ Curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ñ libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: aptitude [-S Ð¸Ð¼ÑÑ„Ð°Ð¹Ð»Ð°] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹] <Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1810,42 +1911,42 @@
 "  Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ (ÐµÑÐ»Ð¸ Ð½Ðµ Ð·Ð°Ð´Ð°Ð½Ð¾, aptitude Ð·Ð°Ð¿ÑƒÑÐºÐ°ÐµÑ‚ÑÑ Ð² Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²Ð¾Ð¼ Ñ€ÐµÐ¶Ð¸Ð¼Ðµ):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ/Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð¸ Ð¸Ñ… Ñ„Ð°Ð¹Ð»Ñ‹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Ð—Ð°Ñ„Ð¸ÐºÑÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ hold Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð°\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚, Ñ‡Ñ‚Ð¾ Ð¾Ð½ Ð±Ñ‹Ð» ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚, Ñ‡Ñ‚Ð¾ Ð¾Ð½ Ð±Ñ‹Ð» ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1853,17 +1954,17 @@
 msgstr ""
 " forbid-version - Ð—Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ aptitude Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÑ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½ÑƒÑŽ Ð²ÐµÑ€ÑÐ¸ÑŽ Ð¿Ð°ÐºÐµÑ‚Ð°.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð½Ð¾Ð²Ñ‹Ñ…/Ð¾Ð±Ð½Ð¾Ð²Ð»Ñ‘Ð½Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1871,58 +1972,58 @@
 msgstr ""
 " dist-upgrade - Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Ð—Ð°Ð±Ñ‹Ñ‚ÑŒ, ÐºÐ°ÐºÐ¸Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ \"Ð½Ð¾Ð²Ñ‹Ðµ\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - ÐŸÐ¾Ð¸ÑÐº Ð¿Ð°ÐºÐµÑ‚Ð° Ð¿Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð¸/Ð¸Ð»Ð¸ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑŽ\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½ÑƒÑŽ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ð°ÐºÐµÑ‚Ðµ\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÑ‚Ð°Ñ€Ñ‹Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - ÐŸÐ¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ changelog Ð¿Ð°ÐºÐµÑ‚Ð°\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» .deb Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð°\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             ÐÑ‚Ð¾Ñ‚ Ñ‚ÐµÐºÑÑ‚ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Ð˜Ð¼Ð¸Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ, Ð½Ð¾ Ð½Ðµ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÑÑ‚ÑŒ Ð¸Ñ… Ð½Ð° ÑÐ°Ð¼Ð¾Ð¼ Ð´ÐµÐ»Ðµ.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1930,18 +2031,18 @@
 " -d             Ð¢Ð¾Ð»ÑŒÐºÐ¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹, Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ Ð¸ Ð½Ðµ "
 "ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Ð’ÑÐµÐ³Ð´Ð° ÑÐ¿Ñ€Ð°ÑˆÐ¸Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             ÐŸÑ€ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°Ñ‚ÑŒ Ð¾Ñ‚Ð²ÐµÑ‚ 'yes' Ð½Ð° Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ð¹ Ð²Ð¾Ð¿Ñ€Ð¾Ñ yes/no\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1950,7 +2051,7 @@
 " -F format      Ð—Ð°Ð´Ð°Ñ‚ÑŒ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¾Ð² Ð¿Ð¾Ð¸ÑÐºÐ°; ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ "
 "Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1958,35 +2059,35 @@
 " -O order       Ð—Ð°Ð´Ð°Ñ‚ÑŒ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ ÑÐ¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²ÐºÐ¸ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¾Ð² Ð¿Ð¾Ð¸ÑÐºÐ°; ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ "
 "Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w width       Ð—Ð°Ð´Ð°Ñ‚ÑŒ ÑˆÐ¸Ñ€Ð¸Ð½Ñƒ Ð²Ñ‹Ð²Ð¾Ð´Ð° Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¾Ð² Ð¿Ð¾Ð¸ÑÐºÐ°\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð½ÐµÑ€Ð°Ð±Ð¾Ñ‚Ð¾ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð²ÐµÑ€ÑÐ¸ÑŽ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð².\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¸Ð·Ð¼ÐµÐ½ÑÐµÐ¼Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð².\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð¿Ð°ÐºÐµÑ‚Ð°.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -1994,21 +2095,21 @@
 " -v             ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½ÑƒÑŽ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ. (Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð²ÐµÐ´ÐµÐ½Ð¾ "
 "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ñ€Ð°Ð·)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 " -t [release]   Ð—Ð°Ð´Ð°Ñ‚ÑŒ Ð²Ñ‹Ð¿ÑƒÑÐº, Ð¸Ð· ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹ Ð¿Ð°ÐºÐµÑ‚Ñ‹\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o key=val     Ð’Ñ€ÑƒÑ‡Ð½ÑƒÑŽ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ "
 "'key'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2017,65 +2118,65 @@
 " --with(out)-recommends\tÐ£ÐºÐ°Ð·Ð°Ñ‚ÑŒ, Ð±ÑƒÐ´ÑƒÑ‚ Ð»Ð¸ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹\n"
 "                Ñ‚Ñ€Ð°ÐºÑ‚Ð¾Ð²Ð°Ñ‚ÑŒÑÑ ÐºÐ°Ðº ÑÑ‚Ñ€Ð¾Ð³Ð¸Ðµ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname: Ð§Ð¸Ñ‚Ð°Ñ‚ÑŒ aptitude Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð¾Ð¼ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ Ð¸Ð· fname.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð¿Ñ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÐµ.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ Ð¿Ñ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÐµ.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  ÐÑ‚Ð° Ð²ÐµÑ€ÑÐ¸Ñ aptitude Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ \"Super Cow Powers\".\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ Ð² Ð²Ð¸Ð´Ðµ ÐºÐ»ÑŽÑ‡=Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ, Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½ %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "Ð¡Ð¢Ð ÐÐÐÐžÐ¡Ð¢Ð¬: Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ ÐºÐ¾Ð´ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð°\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "ÐœÐ¾Ð¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ -u Ð¸Ð»Ð¸ -i\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u Ð¸ -i Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð´Ð°Ð½Ñ‹ Ð² Ñ€ÐµÐ¶Ð¸Ð¼Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑ‚Ñ€Ð¾ÐºÐ¸ (Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, Ñ "
 "'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u Ð¸ -i Ð½Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð´Ð°Ð½Ñ‹ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2106,7 +2207,7 @@
 msgid "Lost"
 msgstr "ÐŸÑ€Ð¾Ð¸Ð³Ñ€Ð°Ð»"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Ð¡Ð°Ð¿Ñ‘Ñ€"
 
@@ -2282,7 +2383,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "ÐŸÐ°ÐºÐµÑ‚"
 
@@ -3748,52 +3849,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Er, ÐµÑÑ‚ÑŒ ÐºÐ°ÐºÐ¸Ðµ-Ñ‚Ð¾ Ð¾ÑˆÐ¸Ð±ÐºÐ¸, ÑÑ‚Ð¾Ð³Ð¾ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ð»Ð¾ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾Ð¹Ñ‚Ð¸.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "ÐŸÐ¾Ð¸ÑÐº:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Ð’Ñ‹ ÑƒÐ¶Ðµ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "ÐŸÐ¾Ð´Ð¿Ñ€Ð¾Ñ†ÐµÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹ -- Ð²Ñ‹ Ð²Ð²ÐµÐ»Ð¸ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ÐºÑÑˆÐ°"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ Ñ€Ð°Ð±Ð¾Ñ‚Ñƒ Ñ Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Ð¡Ñ‚ÐµÑ€ÐµÑ‚ÑŒ Ð²ÑÐµ Ð¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "ÐŸÐ°ÐºÐµÑ‚Ñ‹"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "ÐŸÑ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð¸ Ð²Ñ‹Ð±Ð¾Ñ€ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3811,15 +3912,15 @@
 "Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ñ… ÑƒÑÐ»Ð¾Ð²Ð¸ÑÑ…\n"
 "Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½ÐµÐ¹, ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ 'Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ'."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-ru.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3827,45 +3928,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "ÐžÐ±Ð·Ð¾Ñ€ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸/Ð¸Ð»Ð¸ Ð²Ñ‹Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ñ‹"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐµ"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "ÐÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½ÐµÑ€Ð°Ð±Ð¾Ñ‚Ð¾ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð±Ñ‹Ð»Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ñ‹"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3874,23 +3975,23 @@
 "Ð”Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸/ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ðµ Ð¿Ñ€Ð°Ð²Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸\n"
 "Ð²Ñ‹ Ð² Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ Ð½Ðµ Ð¾Ð±Ð»Ð°Ð´Ð°ÐµÑ‚Ðµ. ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð°Ð²Ð° ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Ð¡Ñ‚Ð°Ñ‚ÑŒ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "ÐÐµ ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒÑÑ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "Ð—Ð°Ð¿ÑƒÑÐº Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¿Ð¸ÑÐºÐ° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð¸Ð»Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑƒÐ¶Ðµ Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ñ‹."
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "ÐÐµÑ‚ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸, ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3902,7 +4003,7 @@
 "ÐÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹, Ð½Ð¾ Ð²Ñ‹ Ð½Ðµ Ð·Ð°Ð´Ð°Ð»Ð¸ Ð¸Ñ… Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ.\n"
 "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ \"U\", Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¸Ñ… Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3911,100 +4012,113 @@
 "Ð”Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¿Ð¸ÑÐºÐ° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ðµ Ð¿Ñ€Ð°Ð²Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸\n"
 "Ð²Ñ‹ Ð² Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ Ð½Ðµ Ð¾Ð±Ð»Ð°Ð´Ð°ÐµÑ‚Ðµ. ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð°Ð²Ð° ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Ð£Ð±ÑŒÑ‘Ð¼ Ð²Ñ€ÐµÐ¼Ñ Ð² Ð¿Ð¾Ð¸ÑÐºÐ°Ñ… Ð¼Ð¸Ð½"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "ÐžÑ‡Ð¸ÑÑ‚ÐºÐ° Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð±Ñ‹Ð»Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ñ ÑƒÑÑ‚Ð°Ñ€ÐµÐ²ÑˆÐ¸Ð¼Ð¸ Ð¿Ð°ÐºÐµÑ‚Ð°Ð¼Ð¸ Ð±Ñ‹Ð»Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Ð£Ð±ÑŒÑ‘Ð¼ Ð²Ñ€ÐµÐ¼Ñ Ð² Ð¿Ð¾Ð¸ÑÐºÐ°Ñ… Ð¼Ð¸Ð½"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "ÐÐµ ÑƒÐ´Ð°Ñ‘Ñ‚ÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ/ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð²ÑÐµ Ð½ÐµÐ·Ð°ÐºÐ¾Ð½Ñ‡ÐµÐ½Ð½Ñ‹Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ, ÐµÑÑ‚ÑŒ Ð»Ð¸ Ð½Ð¾Ð²Ñ‹Ðµ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Ð—Ð°Ð±Ñ‹Ñ‚ÑŒ Ð¾ Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð°ÐºÐµÑ‚Ð°Ñ…"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Ð—Ð°Ð±Ñ‹Ñ‚ÑŒ Ð¾ \"Ð½Ð¾Ð²Ñ‹Ñ…\" Ð¿Ð°ÐºÐµÑ‚Ð°Ñ…"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ÐºÑÑˆ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ€Ð°Ð½ÐµÐµ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ^ÑƒÑÑ‚Ð°Ñ€ÐµÐ²ÑˆÐ¸Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð², ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ð¸ÐºÐ¾Ð³Ð´Ð° Ð½Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ ^Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÐµÐ¼Ñ‹Ðµ"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²ÑÐµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÐµÐ¼Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ðµ Ð·Ð°Ñ„Ð¸ÐºÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹ Ð¾Ñ‚ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Ð˜Ð³Ñ€Ð°Ñ‚ÑŒ Ð² ÑÐ°Ð¿Ñ‘Ñ€Ð°"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Ð¡Ñ‚Ð°Ñ‚ÑŒ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -4013,68 +4127,68 @@
 "Ð—Ð°Ð¿ÑƒÑÐº 'su', Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÑ‚Ð°Ñ‚ÑŒ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼. ÐÑ‚Ð¾ Ð¿Ñ€Ð¸Ð²ÐµÐ´Ñ‘Ñ‚ Ðº Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÐºÑƒ\n"
 "Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹, Ð½Ð¾ Ð²Ð°ÑˆÐ¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð±ÑƒÐ´ÑƒÑ‚ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ñ‹."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^ÐŸÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÑÑˆ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "ÐŸÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÑÑˆ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²."
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Ð’Ñ‹Ð¹Ñ‚Ð¸"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ Ñ€Ð°Ð±Ð¾Ñ‚Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "ÐžÑ‚ÐºÐ°Ñ‚"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÑŽÑŽ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸ÑŽ Ñ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼ Ð¸Ð»Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¹"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Install"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ð¿Ð°ÐºÐµÑ‚ Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¸Ð»Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Remove"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ð¿Ð°ÐºÐµÑ‚ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Purge"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "ÐŸÐ¾Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ Ð¿Ð°ÐºÐµÑ‚ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ð¼ÐµÑÑ‚Ðµ Ñ ÐµÐ³Ð¾ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Keep"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð»ÑŽÐ±Ð¾Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð½Ð°Ð´ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Hold"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4082,11 +4196,11 @@
 "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð»ÑŽÐ±Ð¾Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð½Ð°Ð´ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼ Ð¸ Ð·Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾ Ð¾Ñ‚ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐ¸Ñ… "
 "Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ ^Auto"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4095,11 +4209,11 @@
 "ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹, ÐºÐ°Ðº-Ð±ÑƒÐ´Ñ‚Ð¾ Ð¾Ð½Ð¸ Ð±Ñ‹Ð»Ð¸ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ñ‹ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸;\n"
 "Ð¾Ð½Ð¸ Ð±ÑƒÐ´ÑƒÑ‚ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹, ÐµÑÐ»Ð¸ Ð½Ðµ Ð¾ÑÑ‚Ð°Ð½ÐµÑ‚ÑÑ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð², Ð¾Ñ‚ Ð½Ð¸Ñ… Ð·Ð°Ð²Ð¸ÑÑÑ‰Ð¸Ñ…"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ ^Manual"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4108,11 +4222,11 @@
 "ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹, ÐºÐ°Ðº-Ð±ÑƒÐ´Ñ‚Ð¾ Ð¾Ð½Ð¸ Ð±Ñ‹Ð»Ð¸ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ñ‹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ;\n"
 "Ð¾Ð½Ð¸ Ð½Ðµ Ð±ÑƒÐ´ÑƒÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹, Ð¿Ð¾ÐºÐ° Ð²Ñ‹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð½Ðµ ÑÐ´ÐµÐ»Ð°ÐµÑ‚Ðµ ÑÑ‚Ð¾Ð³Ð¾"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Forbid Ð²ÐµÑ€ÑÐ¸ÑŽ"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4121,215 +4235,215 @@
 "Ð—Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð²ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¿Ð°ÐºÐµÑ‚Ð°;\n"
 "Ð½Ð¾Ð²Ñ‹Ðµ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð¿Ð°ÐºÐµÑ‚Ð° Ð±ÑƒÐ´ÑƒÑ‚ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒÑÑ ÐºÐ°Ðº Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformation"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð±Ð¾Ð»ÑŒÑˆÐµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ Ð¾ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¼ Ð¿Ð°ÐºÐµÑ‚Ðµ"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Debian changelog Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¿Ð°ÐºÐµÑ‚Ð°"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Find"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "ÐÐ°Ð¹Ñ‚Ð¸ Ð¿Ð°ÐºÐµÑ‚"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "ÐÐ°Ð¹Ñ‚Ð¸ ^ÐžÐ¿ÑÑ‚ÑŒ"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð¾Ð¸ÑÐº"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Limit Display"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "ÐŸÑ€Ð¸Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€ Ðº ÑÐ¿Ð¸ÑÐºÑƒ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Un-Limit Display"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Ð¡Ð½ÑÑ‚ÑŒ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€ ÑÐ¾ ÑÐ¿Ð¸ÑÐºÐ° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "ÐÐ°Ð¹Ñ‚Ð¸ ^Broken"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "ÐÐ°Ð¹Ñ‚Ð¸ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ‚ Ñ Ð½ÐµÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÑÐ¼Ð¸"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ°"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸, Ð¾Ñ‚Ð½Ð¾ÑÑÑ‰Ð¸ÐµÑÑ Ðº Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÑƒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Ð Ð°Ð±Ð¾Ñ‚Ð° Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÑÐ¼Ð¸"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸, Ð¾Ñ‚Ð½Ð¾ÑÑÑ‰Ð¸ÐµÑÑ Ðº Ñ‚Ð¾Ð¼Ñƒ ÐºÐ°Ðº Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÑŽÑ‚ÑÑ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚Ð¸"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Ð Ð°Ð·Ð½Ð¾Ðµ"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¸Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Ð¡Ð±Ñ€Ð¾ÑÐ¸Ñ‚ÑŒ Ð²ÑÐµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð² Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰ÐµÐµ"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¼Ñƒ Ð¾ÐºÐ½Ñƒ"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐµ"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¼Ñƒ Ð¾ÐºÐ½Ñƒ"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ ÑÑ‚Ð¾ Ð¾ÐºÐ½Ð¾"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "ÐÐ¾Ð²Ð¾Ðµ ^Ð¾ÐºÐ½Ð¾ ÐŸÐ°ÐºÐµÑ‚Ð°"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾Ðµ Ð¾ÐºÐ½Ð¾ Ð¿Ð°ÐºÐµÑ‚Ð° Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "ÐÐ¾Ð²Ñ‹Ð¹ ^Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¹"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¿Ð°ÐºÐµÑ‚Ñ‹ ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸ÑÐ¼"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Ðž Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾Ð± ÑÑ‚Ð¾Ð¹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Ð ÑƒÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ðµ Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^Ð§ÐÐ’Ðž"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ñ‡Ð°ÑÑ‚Ð¾ Ð·Ð°Ð´Ð°Ð²Ð°ÐµÐ¼Ñ‹Ñ… Ð²Ð¾Ð¿Ñ€Ð¾ÑÐ¾Ð²"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð²Ð°Ð¶Ð½Ñ‹Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ, ÑÐ´ÐµÐ»Ð°Ð½Ð½Ñ‹Ðµ Ð² ÐºÐ°Ð¶Ð´Ð¾Ð¹ Ð²ÐµÑ€ÑÐ¸Ð¸ ÑÑ‚Ð¾Ð¹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑƒÑÐ»Ð¾Ð²Ð¸Ñ, ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "ÐŸÐ¾Ð¸ÑÐº"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "ÐžÐºÐ½Ð°"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: ÐœÐµÐ½ÑŽ  %s: ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ  %s: Ð’Ñ‹Ñ…Ð¾Ð´  %s: ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ  %s: Ð—Ð°Ð³Ñ€ÑƒÐ·/Ð£ÑÑ‚Ð°Ð½/Ð£Ð´Ð°Ð» Ð¿ÐºÑ‚"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
@@ -4371,13 +4485,56 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "ÐžÐ¹!  ÐŸÐ¾Ð»ÑƒÑ‡ÐµÐ½ ÑÐ¸Ð³Ð½Ð°Ð» SIGQUIT, Ð²Ñ‹Ñ…Ð¾Ð´..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ð”Ð°"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "ÐÐµÑ‚"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "ÐšÐ¾Ð¼Ð°Ð½Ð´Ñ‹:\n"
+#~ "  y: Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹\n"
+#~ "  n: Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ Ð¸ Ð²Ñ‹Ð¹Ñ‚Ð¸\n"
+#~ "  i: Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾Ð± Ð¾Ð´Ð½Ð¾Ð¼ Ð¸Ð»Ð¸ Ð±Ð¾Ð»ÐµÐµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
+#~ "     Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾ÑÐ»Ðµ 'i'.\n"
+#~ "  c: Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Debian changelog Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð»Ð¸ Ð±Ð¾Ð»ÐµÐµ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²;\n"
+#~ "     Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð² ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÑŽÑ‚ÑÑ Ð¿Ð¾ÑÐ»Ðµ 'c'\n"
+#~ "  d: Ð²ÐºÐ»/Ð²Ñ‹ÐºÐ» Ð¿Ð¾ÐºÐ°Ð· Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ‚ÐµÐ¹\n"
+#~ "  s: Ð²ÐºÐ»/Ð²Ñ‹ÐºÐ» Ð¿Ð¾ÐºÐ°Ð· Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
+#~ "  v: Ð²ÐºÐ»/Ð²Ñ‹ÐºÐ» Ð¿Ð¾ÐºÐ°Ð· Ð²ÐµÑ€ÑÐ¸Ð¹\n"
+#~ "  e: Ð²Ð¾Ð¹Ñ‚Ð¸ Ð² Ð¿Ð¾Ð»Ð½Ñ‹Ð¹ Ð²Ð¸Ð·ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ\n"
+#~ "\n"
+#~ "  Ð¢Ð°ÐºÐ¶Ðµ Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸ÑÐ¼ Ð½Ð°Ð´ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð¼ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð².\n"
+#~ "  Ð”Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾, Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð» Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¸ Ð·Ð° Ð½Ð¸Ð¼ Ð¾Ð´Ð½Ð¾ Ð¸ Ð±Ð¾Ð»ÐµÐµ Ð¸Ð¼Ñ‘Ð½ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð²\n"
+#~ "Ð¸Ð»Ð¸ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð². Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¾ ÐºÐ¾ Ð²ÑÐµÐ¼ Ð¿Ð°ÐºÐµÑ‚Ð°Ð¼. (Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ "
+#~ "Ð·Ð°Ð´Ð°Ñ‚ÑŒ\n"
+#~ "Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ; ÐºÐ°Ð¶Ð´Ð¾Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¾ ÐºÐ¾ Ð²ÑÐµÐ¼ Ð¿Ð°ÐºÐµÑ‚Ð°Ð¼\n"
+#~ "ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ Ð¿Ð¾ÑÐ»Ðµ Ð½ÐµÐ³Ð¾)\n"
+#~ "\n"
+#~ "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ:\n"
+#~ "  + : Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ\n"
+#~ "  - : Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ\n"
+#~ "  _ : Ð’Ñ‹Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ\n"
+#~ "  = : Ð—Ð°Ñ„Ð¸ÐºÑÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-11-08 11:53+0100\n"
 "Last-Translator: Stanislav ValÃ¡Å¡ek <stano_valasek at pobox.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -150,7 +150,7 @@
 msgstr "Automaticky odstrÃ¡niÅ¥ nepouÅ¾ÃvanÃ© balÃky vyhovujÃºce filtru"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
@@ -293,47 +293,47 @@
 "Pozn: vyberÃ¡m \"%s\" miesto\n"
 "      virtuÃ¡lneho balÃku \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s je uÅ¾ inÅ¡talovanÃ½ v poÅ¾adovanej verziÃ (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s nie je nainÅ¡talovanÃ½, preto nebude nainÅ¡talovanÃ½.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "BalÃk %s nie je nainÅ¡talovanÃ½, nebude teda odstrÃ¡nenÃ½\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "BalÃk %s nie je nainÅ¡talovanÃ½, nemoÅ¾no teda zakÃ¡zaÅ¥ aktualizÃ¡ciu\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "BalÃk %s nie je aktualizovateÄ¾nÃ½, nemoÅ¾no teda zakÃ¡zat aktualizÃ¡ciu\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Pozn: vyberÃ¡m na inÅ¡talÃ¡ciu Ãºlohu \"%s: %s\"\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "Verziu balÃku mÃ´Å¾ete zadaÅ¥ iba s prÃkazom 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "ArchÃv balÃku mÃ´Å¾ete zadaÅ¥ iba s prÃkazom 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -342,7 +342,7 @@
 "Nemohol som nÃ¡jsÅ¥ balÃk \"%s\" a viac neÅ¾ 40\n"
 "balÃkov obsahuje \"%s\" vo svojom nÃ¡zve.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -351,13 +351,13 @@
 "Nemohol som nÃ¡jsÅ¥ balÃk \"%s\", ale nasledujÃºce balÃky\n"
 "obsahujÃº \"%s\" vo svojom nÃ¡zve:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Nemohol som nÃ¡jsÅ¥ balÃk, ktorÃ©ho nÃ¡zov alebo popis sa zhoduje s \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -366,7 +366,7 @@
 "Nemohol som nÃ¡jsÅ¥ balÃk vyhovujÃºci \"%s\" a viac neÅ¾ 40\n"
 "balÃkov obsahuje \"%s\" vo svojom popise.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -375,6 +375,11 @@
 "Nemohol som nÃ¡jsÅ¥ balÃk vyhovujÃºci \"%s\", ale nasledujÃºce balÃky\n"
 "obsahujÃº \"%s\" vo svojom popise:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "ChybnÃ¡ akcia '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "NemÃ´Å¾em spustiÅ¥ sensible-pager - je tento Debian vÃ´bec funkÄnÃ½?"
@@ -414,7 +419,7 @@
 msgid "Invalid operation %s"
 msgstr "NeplatnÃ¡ operÃ¡cia %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -425,16 +430,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "download: musÃte zadaÅ¥ aspoÅˆ jeden balÃk na stiahnutie\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "NemÃ´Å¾em ÄÃtaÅ¥ zoznam zdrojov"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "NemÃ´Å¾em nÃ¡jsÅ¥ balÃk nazvanÃ½ \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -490,95 +495,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "ÄŒo to je? ÄŒo by to bolo! Predsa had Å¾erÃºci slona.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "NemÃ´Å¾em ÄÃtaÅ¥ zoznam zdrojov"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "ale %s sa bude inÅ¡talovaÅ¥."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "ale %s je nainÅ¡talovanÃ½ a je podrÅ¾anÃ½ v aktuÃ¡lnom stave."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ale %s nie je inÅ¡talovanÃ½."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "ale nedÃ¡ sa nainÅ¡talovaÅ¥"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " Äo je virtuÃ¡lny balÃk."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " alebo"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "NasledujÃºce balÃky sÃº POÅ KODENÃ‰:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "NasledujÃºce balÃky sÃº nepouÅ¾ÃvanÃ© a budÃº ODSTRÃNENÃ‰:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "NasledujÃºce balÃky sÃº automaticky podrÅ¾anÃ© v aktuÃ¡lnom stavu:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "NasledujÃºce NOVÃ‰ balÃky budÃº nainÅ¡talovanÃ© automaticky:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "NasledujÃºce balÃky budÃº automaticky ODSTRÃNENÃ‰:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "NasledujÃºce balÃky budÃº DEGRADOVANÃ‰:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "NasledujÃºce balÃky sÃº podrÅ¾anÃ© v aktuÃ¡lnom stave:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "NasledujÃºce balÃky budÃº reinÅ¡talovanÃ©:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "NasledujÃºce NOVÃ‰ balÃky budÃº inÅ¡talovanÃ©:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "NasledujÃºce balÃky budÃº ODSTRÃNENÃ‰:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "NasledujÃºce balÃky budÃº aktualizovanÃ©:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "NasledujÃºce NUTNÃ‰ balÃky budÃº ODSTRÃNENÃ‰!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "NasledujÃºce NUTNÃ‰ balÃky budÃº touto akciou PORUÅ ENÃ‰:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -587,99 +592,226 @@
 "VAROVÃNÃ: VykonanÃm tejto akcie pravdepodobne poÅ¡kodÃte systÃ©m!\n"
 "          Ak PRESNE neviete, Äo robÃte, NEPOKRAÄŒUJTE!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Som si vedomÃ½, Å¾e to je zlÃ½ nÃ¡pad"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Na pokraÄovanie napÃÅ¡te frÃ¡zu \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Ãno"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "Nie"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Na pokraÄovanie napÃÅ¡te frÃ¡zu \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "NasledujÃºce balÃky sÃº DOPORUÄŒENÃ‰, ale NEBUDÃš inÅ¡talovanÃ©:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "NasledujÃºce balÃky sÃº NAVRHOVANÃ‰, ale NEBUDÃš inÅ¡talovanÃ©:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Å½iadne balÃky sa nebudÃº inÅ¡talovaÅ¥, aktualizovaÅ¥ alebo odstraÅˆovat.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu balÃkov aktualizovanÃ½ch, %lu novo inÅ¡talovanÃ½ch, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinÅ¡talovanÃ©, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradovanÃ©, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu k odstrÃ¡nenie a %lu neaktualizovanÃ©.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Potrebujem stiahnuÅ¥ %sB/%sB archÃvov. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Potrebujem stiahnuÅ¥ %sB archÃvov. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Po rozbalenÃ bude pouÅ¾itÃ½ch %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Po rozbalenÃ bude uvoÄ¾nenÃ½ch %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "ChybnÃ¡ akcia '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Nie je Äo zobraziÅ¥ -- zadajte nÃ¡zvy balÃkov na riadok za 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Na pokraÄovanie stlaÄte Enter."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Å½iadne balÃky nenÃ¡jdenÃ© -- zadajte nÃ¡zvy balÃkov na riadok za 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Na pokraÄovanie stlaÄte Enter."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "FormÃ¡t na zobrazenie balÃkov"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^InÅ¡talovaÅ¥/odstrÃ¡niÅ¥ balÃky"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "NasledujÃºce NOVÃ‰ balÃky budÃº nainÅ¡talovanÃ© automaticky:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^InÅ¡talovaÅ¥/odstrÃ¡niÅ¥ balÃky"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^ZabudnÃºÅ¥ novÃ© balÃky"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - OchrÃ¡ni balÃky pred aktualizÃ¡ciou\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - OznaÄÃ balÃky, ako Å¾e boli inÅ¡talovanÃ© automaticky\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - OznaÄÃ balÃky, ako Å¾e boli inÅ¡talovanÃ© ruÄne\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "doporuÄuje"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Chcete pokraÄovaÅ¥? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -690,7 +822,7 @@
 "InformÃ¡cie o zÃ¡vislostiach budÃº zobrazenÃ©.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -701,7 +833,7 @@
 "InformÃ¡cie o zÃ¡vislostiach nebudÃº zobrazenÃ©.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -712,7 +844,7 @@
 "Verzie budÃº zobrazenÃ©.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -723,7 +855,7 @@
 "Verzie nebudÃº zobrazenÃ©.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -734,7 +866,7 @@
 "Zmeny veÄ¾kostÃ budÃº zobrazenÃ©.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -745,128 +877,102 @@
 "Zmeny veÄ¾kostÃ nebudÃº zobrazenÃ©.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"PrÃkazy:\n"
-"  y: pokraÄovaÅ¥ v inÅ¡talÃ¡cii\n"
-"  n: preruÅ¡iÅ¥ a skonÄiÅ¥\n"
-"  i: zobrazÃ informÃ¡cie o balÃkoch, ktorÃ½ch nÃ¡zvy\n"
-"     nasledujÃº za 'i'.\n"
-"  c: zobrazÃ zoznamy zmien, ktorÃ© vykonali sprÃ¡vcovia balÃkov;\n"
-"     nÃ¡zvy balÃkov uveÄte za 'c'\n"
-"  d: zapne/vypne zobrazenie informÃ¡ciÃ o zÃ¡vislostiach\n"
-"  s: zapne/vypne zobrazenie zmien vo veÄ¾kostiach balÃkov\n"
-"  v: zapne/vypne zobrazenie verzii\n"
-"  e: vstÃºpiÅ¥ do plne vizuÃ¡lneho rozhrania\n"
-"\n"
-"  TieÅ¾ mÃ´Å¾ete zadaÅ¥ dodatoÄnÃ© akcie nad balÃkmi:\n"
-"  NapÃÅ¡te znak akcie nasledovanÃ½ jednÃ½m alebo viac nÃ¡zvami balÃkov alebo "
-"vzorov.\n"
-"Akcia sa vykonÃ¡ na vÅ¡etkÃ½ch zadanÃ½ch balÃkoch. (MÃ´Å¾ete zadaÅ¥ i viac akcii,\n"
-"kaÅ¾dÃ¡ sa vzÅ¥ahuje na balÃky, ktorÃ© ju nasledujÃº.)\n"
-"\n"
-"Akce:\n"
-"  + : InÅ¡talÃ¡cia\n"
-"  - : OdstrÃ¡nenie\n"
-"  _ :  OdstrÃ¡nenie aj s konfigurÃ¡ciou\n"
-"  = : PodrÅ¾anie v aktuÃ¡lnom stave\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "ChybnÃ¡ odpoveÄ. Zadajte platnÃ½ prÃkaz alebo '?' na pomoc.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "UkonÄÃ program"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "NasledujÃºce balÃky majÃº nesplnenÃ© zÃ¡vislosti:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "NasledujÃºce balÃky sÃº POÅ KODENÃ‰:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Chyba pri zÃ¡pise stavovÃ©ho sÃºboru"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "ChybnÃ¡ odpoveÄ. Zadajte platnÃ½ prÃkaz alebo '?' na pomoc.\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "ChybnÃ¡ odpoveÄ. Zadajte platnÃ½ prÃkaz alebo '?' na pomoc.\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1161,7 +1267,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "VymazÃ¡vam starÃ© stiahnutÃ© sÃºbory"
 
@@ -1443,23 +1549,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "NemÃ´Å¾em opraviÅ¥ zÃ¡vislosti, niektorÃ© balÃky nemÃ´Å¾u byÅ¥ nainÅ¡talovanÃ©"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "NedÃ¡ sa preÄÃtaÅ¥ zoznam zdrojov."
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Zoznamy balÃkov alebo stavovÃ½ sÃºbor nemoÅ¾no otvoriÅ¥ alebo spracovaÅ¥."
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "Na opravenie chÃ½bajÃºcich sÃºborov skÃºste aktualizovaÅ¥ zoznamy balÃkov"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "NemÃ´Å¾em otvoriÅ¥ %s na zÃ¡pis"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1729,17 +1830,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "NeplatnÃ½ triediaci mechanizmus '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s skompilovanÃ½ %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "KompilÃ¡tor: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1748,7 +1849,7 @@
 "\n"
 "Verzia ncurses: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1757,22 +1858,22 @@
 "\n"
 "Verzia curses: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "verzia libsigc++: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "PouÅ¾itie: aptitude [-S nÃ¡zsub] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [voÄ¾by] <akcie> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1781,42 +1882,42 @@
 "  Akcie (ak nie sÃº zadanÃ©, aptitude spustÃ interaktÃvny reÅ¾im):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - InÅ¡taluje/aktualizuje balÃky\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - OdstrÃ¡ni balÃky\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - OdstrÃ¡ni balÃky a ich konfiguraÄnÃ© sÃºbory\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - OchrÃ¡ni balÃky pred aktualizÃ¡ciou\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - ZruÅ¡Ã ochranu balÃku pred aktualizÃ¡ciou\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - OznaÄÃ balÃky, ako Å¾e boli inÅ¡talovanÃ© automaticky\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - OznaÄÃ balÃky, ako Å¾e boli inÅ¡talovanÃ© ruÄne\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1824,17 +1925,17 @@
 msgstr ""
 " forbid-version - ZakÃ¡Å¾e aptitude aktualizÃ¡ciu na konkrÃ©tnu verziu balÃku.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Stiahne zoznamy novÃ½ch/aktualizovateÄ¾nÃ½ch balÃkov\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - VykonÃ¡ bezpeÄnÃº aktualizÃ¡ciu\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1843,76 +1944,76 @@
 " dist-upgrade - VykonÃ¡ aktualizÃ¡ciu, pri ktorÃ© moÅ¾no (na|od)inÅ¡taluje "
 "balÃky\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Zabudne, ktorÃ© balÃky sÃº \"novÃ©\"\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - HÄ¾adÃ¡ balÃky podÄ¾a mena a/alebo vÃ½razu\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - ZobrazÃ podrobnÃ© informÃ¡cie o balÃku\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - VymaÅ¾e stiahnutÃ© .deb sÃºbory balÃkov\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - VymaÅ¾e starÃ© stiahnutÃ© .deb sÃºbory balÃkov\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - ZobrazÃ zoznam zmien balÃku\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Stiahne .deb sÃºbor balÃku\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  VoÄ¾by:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             TÃ¡to pomoc\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Iba simuluje, niÄ reÃ¡lne nevykonÃ¡va.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Stiahne balÃky, ale niÄ neinÅ¡taluje alebo neodstraÅˆuje.\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             VÅ¾dy vyÅ¾aduje potvrdenie akciou\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 " -y             Na jednoduchÃ© ano/ne otÃ¡zky odpovie automaticky 'ano'\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1920,60 +2021,60 @@
 msgstr ""
 " -F formÃ¡t      Zadajte formÃ¡t na zobrazenie vÃ½sledkov hÄ¾adania; viÄ manuÃ¡l\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 " -O radenie      Zadajte, ako sa majÃº vÃ½sledky hÄ¾adania zoradiÅ¥; viÄ manuÃ¡l\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w Å¡Ãrka       Zadajte Å¡Ãrku zobrazenia vÃ½sledkov hÄ¾adania\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             AgresÃvne sa pokÃºsi opraviÅ¥ poÅ¡kodenÃ© balÃky.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             ZobrazÃ verziu balÃkov, ktorÃ© sa majÃº inÅ¡talovaÅ¥.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             ZobrazÃ zÃ¡vislosti automaticky zmenenÃ½ch balÃkov.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    ZobrazÃ zmenu v inÅ¡talovaniej veÄ¾kosti kaÅ¾dÃ©ho balÃku.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 " -v             ZobrazÃ dodatoÄnÃ© informÃ¡cie. (MÃ´Å¾ete zadaÅ¥ niekoÄ¾kokrÃ¡t.)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 " -t [verzia]     Vyberie verziu Debianu, z ktorej sa majÃº balÃky inÅ¡talovaÅ¥\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o kÄ¾ÃºÄ=hodn   NastavÃ konfiguraÄnÃº voÄ¾bu nazvanÃº 'kÄ¾ÃºÄ'\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1982,63 +2083,63 @@
 " --with(out)-recommends\tNastavÃ, Äi sa majÃº doporuÄenÃ© zÃ¡vislosti\n"
 "                braÅ¥ ako silnÃ© zÃ¡vislosti\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S  menosub: NaÄÃtaÅ¥ rozÅ¡ÃrenÃ© stavovÃ© informÃ¡cie zo sÃºboru menosub.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Pri Å¡tarte stiahnuÅ¥ novÃ© zoznamy balÃkov.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Pri Å¡tarte spustiÅ¥ inÅ¡talÃ¡ciu.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  TÃ¡to aptitude nemÃ¡ schopnosti svÃ¤tej kravy.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o vyÅ¾aduje argument v tvare kÄ¾ÃºÄ=hodnota, zadanÃ© %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ZVLÃÅ TNE: obdrÅ¾anÃ½ kÃ³d neznÃ¡mej voÄ¾by\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "MÃ´Å¾ete zadaÅ¥ iba jednu z volieb -u a -i\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "-u a -i nemÃ´Å¾u byÅ¥ pouÅ¾itÃ© v riadkovom mÃ³de (napr. s 'install')"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u a -i nemÃ´Å¾u byÅ¥ pouÅ¾itÃ© spoloÄne s prÃkazom"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "NeznÃ¡my prÃkaz \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2069,7 +2170,7 @@
 msgid "Lost"
 msgstr "Prehral"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "HÄ¾adanie mÃn"
 
@@ -2245,7 +2346,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "BalÃk"
 
@@ -3692,52 +3793,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Hmm, nenastali Å¾iadne chyby; to by sa nemalo stÃ¡vaÅ¥.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "HÄ¾adaÅ¥:"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "UÅ¾ ste root!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Podproces skonÄil chybou -- zadali ste sprÃ¡vne heslo?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "NahrÃ¡vam cache"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "SkutoÄne ukonÄiÅ¥ Aptitude?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "SkutoÄne zahodiÅ¥ osobnÃ© nastavenie a naÄÃtaÅ¥ Å¡tandardnÃ© hodnoty?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "BalÃky"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "ZobrazÃ dostupnÃ© balÃky a akcie, ktorÃ© s nimi mÃ´Å¾ete vykonÃ¡vaÅ¥"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3753,15 +3854,15 @@
 "Pomoc, 'licencia'. Toto je slobodnÃ½ softvÃ©r a budeme radi, ak ho\n"
 "budete Äalej Å¡ÃriÅ¥; podrobnosti viÄ 'licencia'."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-sk.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README.sk"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3769,45 +3870,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "PokraÄovaÅ¥"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "NÃ¡hÄ¾ad inÅ¡talÃ¡cie balÃkov"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "ZobrazÃ a/alebo upravÃ akcie, ktorÃ© sa majÃº vykonaÅ¥"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "^PredchÃ¡dzajÃºce"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "NiektorÃ© balÃky boli poÅ¡kodenÃ©, ale podarilo sa ich opraviÅ¥"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3816,24 +3917,24 @@
 "InÅ¡talÃ¡cia/odobranie balÃkov vyÅ¾aduje administrÃ¡torskÃ© prÃ¡va, ktorÃ©\n"
 "momentÃ¡lne nemÃ¡te. Chcete sa prepnÃºÅ¥ na ÃºÄet root?\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "StaÅ¥ sa rootom"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "NestaÅ¥ sa rootom"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3846,7 +3947,7 @@
 "aktualizovaÅ¥.\n"
 "AktualizÃ¡ciu mÃ´Å¾ete pripraviÅ¥ klÃ¡vesou \"U\"."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3855,99 +3956,112 @@
 "AktualizÃ¡cia zoznamu balÃkov vyÅ¾aduje administrÃ¡torskÃ© prÃ¡va, ktorÃ©\n"
 "momentÃ¡lne nemÃ¡te. Chcete sa prepnÃºÅ¥ na ÃºÄet root?\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "VymazÃ¡vam stiahnutÃ© sÃºbory"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "StiahnutÃ© balÃky boli vymazanÃ©"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "StarÃ© stiahnutÃ© balÃky boli vymazanÃ©"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "ZabiÅ¥ Äas hÄ¾adanÃm mÃn."
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "NemÃ´Å¾em otvoriÅ¥ %s na zÃ¡pis"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^InÅ¡talovaÅ¥/odstrÃ¡niÅ¥ balÃky"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "VykonÃ¡ vÅ¡etky nevykonanÃ© inÅ¡talÃ¡cie a odstraÅˆovania"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^AktualizovaÅ¥ zoznam balÃkov"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "ZistÃ, Äi nie sÃº k dispozÃcii novÅ¡ie verzie balÃkov"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^ZabudnÃºÅ¥ novÃ© balÃky"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Zabudne, ktorÃ© balÃky sÃº \"novÃ©\""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "VyÄistiÅ¥ ^cache s balÃkmi"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "VymaÅ¾e stiahnutÃ© sÃºbory (balÃky) z /var/cache/apt"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "VyÄistiÅ¥ starÃ© sÃºb^ory"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "VymaÅ¾e sÃºbory, ktorÃ© sa uÅ¾ nedajÃº stiahnuÅ¥"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "OznaÄiÅ¥ aktualizovateÄ¾nÃ©"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "ZahraÅ¥ si mÃnovÃ© ^pole"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "StaÅ¥ sa rootom"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3956,69 +4070,69 @@
 "Na prepnutie na uÅ¾ÃvateÄ¾a root spusÅ¥te 'su'. TÃ½m sa program reÅ¡tartuje,\n"
 "ale nastavenia budÃº zachovanÃ©"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "Znovu naÄÃtaÅ¥ cache"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Znovu naÄÃtaÅ¥ obsah cache"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "Koniec"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "UkonÄÃ program"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "SpÃ¤Å¥"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^InÅ¡talovaÅ¥"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 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:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "Odst^rÃ¡niÅ¥"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "OznaÄÃ aktuÃ¡lny vybranÃ½ balÃk na odstrÃ¡nenie"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "VyÄistiÅ¥"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "PonechaÅ¥"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Na vybranom balÃku zruÅ¡Ã vÅ¡etky akcie"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "PodrÅ¾aÅ¥"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4026,11 +4140,11 @@
 "Na vybranom balÃku zruÅ¡Ã vÅ¡etky akcie a ochrÃ¡ni ho pred budÃºcimi "
 "aktualizÃ¡ciami."
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "OznaÄiÅ¥ ^automaticky"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4039,11 +4153,11 @@
 "OznaÄÃ vybranÃ½ balÃk, ako inÅ¡talovanÃ½ automaticky;\n"
 "ak na Åˆom nebudÃº zÃ¡visieÅ¥ inÃ© balÃky, bude automaticky odstrÃ¡nenÃ½."
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "OznaÄiÅ¥ ruÄne"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4052,11 +4166,11 @@
 "OznaÄÃ vybranÃ½ balÃk, ako by bol nainÅ¡talovanÃ½ ruÄne;\n"
 "a nebude odstrÃ¡nenÃ½, pokiaÄ¾ ho neodstrÃ¡nite sami"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "ZakÃ¡zaÅ¥ ^verziu"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4065,215 +4179,215 @@
 "ZakÃ¡Å¾e, aby sa nainÅ¡talovala kandidÃ¡tska verzia balÃku;\n"
 "novÅ¡ie verzie balÃku sa budÃº inÅ¡talovaÅ¥ ako zvyÄajne"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^nformÃ¡cie"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Na vybranÃ½ balÃk zobrazÃ ÄalÅ¡ie informÃ¡cie"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 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:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "HÄ¾adaÅ¥"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "HÄ¾adÃ¡ balÃk"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "HÄ¾adaÅ¥ znova"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Zopakuje poslednÃ© hÄ¾adanie"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "ObmedziÅ¥ zobrazenie"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Na zoznam balÃkov aplikuje vÃ½berovÃ½ filter"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "ZruÅ¡iÅ¥ obmedzenie"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "OdstrÃ¡ni filter aplikovanÃ½ na zoznam balÃkov"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "HÄ¾adaÅ¥ poruÅ¡enÃ©"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "HÄ¾adÃ¡ ÄalÅ¡Ã balÃk s nesplnenÃ½mi zÃ¡vislosÅ¥ami"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "Nastavenie zobrazenia"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "ZmenÃ nastavenia, ktorÃ© ovplyvÅˆujÃº uÅ¾ÃvateÄ¾skÃ© rozhranie"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "SprÃ¡va zÃ¡vislostÃ"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "RÃ´zne"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "ZmenÃ rÃ´zne nastavenia programu"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "PÃ´vodnÃ© nastavenia"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "VrÃ¡ti vÅ¡etky nastavenia do pÃ´vodnÃ©ho stavu"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "ÄŽalÅ¡Ã"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "ZobrazÃ ÄalÅ¡Ã pohÄ¾ad"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^PredchÃ¡dzajÃºce"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "ZobrazÃ predchÃ¡dzajÃºci pohÄ¾ad"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "ZavrieÅ¥"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Zavrie tento pohÄ¾ad"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "No^vÃ½ pohÄ¾ad na balÃky"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "VytvorÃ novÃ½ Å¡tandardnÃ½ pohÄ¾ad na balÃky"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "NovÃ½ prehliadaÄ kategoriÃ"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Prehliada balÃky podÄ¾a kategoriÃ"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "O progr^ame"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "ZobrazÃ informÃ¡cie o programe"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "ZobrazÃ on-line pomoc"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "UÅ¾ÃvatelskÃ½ ^manuÃ¡l"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "ZobrazÃ podrobnÃ½ manuÃ¡l tohto programu"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "ZobrazÃ zoznam Äasto kladenÃ½ch otÃ¡zok"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "ZobrazÃ dÃ´leÅ¾itÃ© zmeny medzi jednotlivÃ½mi verziami programu"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "ZobrazÃ podmienky, za ktorÃ½ch mÃ´Å¾ete program Å¡ÃriÅ¥"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Akcie"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "HÄ¾adat"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "VoÄ¾by"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "PohÄ¾ady"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Menu  %s: Pomoc  %s: Koniec  %s AktualizÃ¡cia  %s Stiahnutie/InÅ¡talÃ¡cia"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ano_key"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ne_key"
 
@@ -4315,13 +4429,56 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Au! Dostal ma SIGQUIT, umieram..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Ãno"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "Nie"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "PrÃkazy:\n"
+#~ "  y: pokraÄovaÅ¥ v inÅ¡talÃ¡cii\n"
+#~ "  n: preruÅ¡iÅ¥ a skonÄiÅ¥\n"
+#~ "  i: zobrazÃ informÃ¡cie o balÃkoch, ktorÃ½ch nÃ¡zvy\n"
+#~ "     nasledujÃº za 'i'.\n"
+#~ "  c: zobrazÃ zoznamy zmien, ktorÃ© vykonali sprÃ¡vcovia balÃkov;\n"
+#~ "     nÃ¡zvy balÃkov uveÄte za 'c'\n"
+#~ "  d: zapne/vypne zobrazenie informÃ¡ciÃ o zÃ¡vislostiach\n"
+#~ "  s: zapne/vypne zobrazenie zmien vo veÄ¾kostiach balÃkov\n"
+#~ "  v: zapne/vypne zobrazenie verzii\n"
+#~ "  e: vstÃºpiÅ¥ do plne vizuÃ¡lneho rozhrania\n"
+#~ "\n"
+#~ "  TieÅ¾ mÃ´Å¾ete zadaÅ¥ dodatoÄnÃ© akcie nad balÃkmi:\n"
+#~ "  NapÃÅ¡te znak akcie nasledovanÃ½ jednÃ½m alebo viac nÃ¡zvami balÃkov alebo "
+#~ "vzorov.\n"
+#~ "Akcia sa vykonÃ¡ na vÅ¡etkÃ½ch zadanÃ½ch balÃkoch. (MÃ´Å¾ete zadaÅ¥ i viac "
+#~ "akcii,\n"
+#~ "kaÅ¾dÃ¡ sa vzÅ¥ahuje na balÃky, ktorÃ© ju nasledujÃº.)\n"
+#~ "\n"
+#~ "Akce:\n"
+#~ "  + : InÅ¡talÃ¡cia\n"
+#~ "  - : OdstrÃ¡nenie\n"
+#~ "  _ :  OdstrÃ¡nenie aj s konfigurÃ¡ciou\n"
+#~ "  = : PodrÅ¾anie v aktuÃ¡lnom stave\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-03-28 10:53-0500\n"
+"POT-Creation-Date: 2005-05-01 13:15-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"
@@ -23,141 +23,242 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: src/apt_options.cc:62
+#: src/apt_options.cc:109
 msgid "Display some available commands at the top of the screen"
 msgstr "Ipakita ang magagamit na mga utos sa itaas ng tabing"
 
-#: src/apt_options.cc:64
+#: src/apt_options.cc:111
 msgid "Hide the menubar when it is not being used"
 msgstr "Itago ang menubar kapag ito'y hindi ginagamit"
 
-#: src/apt_options.cc:66
+#: src/apt_options.cc:113
 msgid "Use a minibuffer-style prompt when possible"
 msgstr "Gamitin ang anyong minibuffer na prompt kung kaya"
 
-#: src/apt_options.cc:68
+#: src/apt_options.cc:115
 msgid "Show partial search results (incremental search)"
 msgstr "Ipakita ang di buong resulta ng paghahanap (incremental)"
 
-#: src/apt_options.cc:70
+#: src/apt_options.cc:117
 msgid "Closing the last view exits the program"
 msgstr "Lalabas sa programa sa pagsara ng huling pananaw"
 
-#: src/apt_options.cc:72
+#: src/apt_options.cc:119
 msgid "Prompt for confirmation at exit"
 msgstr "Magtanong muna bago lumabas"
 
-#: src/apt_options.cc:74
+#: src/apt_options.cc:121
 msgid "Pause after downloading files"
 msgstr "Tumigil panandali matapos makuha ang mga tipunan"
 
-#: src/apt_options.cc:76
+#: src/apt_options.cc:123
+#, fuzzy
+msgid "Never"
+msgstr "Servers"
+
+#: src/apt_options.cc:124
+msgid "When an error occurs"
+msgstr ""
+
+#: src/apt_options.cc:125
+msgid "Always"
+msgstr ""
+
+#: src/apt_options.cc:127
 msgid "Use a 'status-line' download indicator for all downloads"
 msgstr "Gumamit ng pabadya ng pagkuha sa lahat ng kinukuha sa 'status-line'"
 
-#: src/apt_options.cc:78
+#: src/apt_options.cc:129
 msgid "Display the extended description area by default"
 msgstr "Ipakita ang mahabang paglalarawan"
 
-#: src/apt_options.cc:80
+#: src/apt_options.cc:131
 msgid "Advance to the next item after changing the state of a package"
 msgstr "Sumulong sa susunod na pakete matapos palitan ang estado ng pakete"
 
-#: src/apt_options.cc:82
+#: src/apt_options.cc:133
 msgid "Automatically show why packages are broken"
 msgstr "Ipakita kaagad kung bakit sira ang mga pakete"
 
-#: src/apt_options.cc:84
+#: src/apt_options.cc:135
 msgid "The default grouping method for package views"
 msgstr "Ang default na pag-grupo ng pagtanaw ng mga pakete"
 
-#: src/apt_options.cc:86
+#: src/apt_options.cc:137
 msgid "The default display-limit for package views"
 msgstr "Ang default na palugit ng ipapakita sa pagtanaw ng mga pakete"
 
-#: src/apt_options.cc:88
+#: src/apt_options.cc:139
 msgid "The display format for package views"
 msgstr "Ang anyo ng ipapakita para sa pagtanaw ng mga pakete"
 
-#: src/apt_options.cc:91
+#: src/apt_options.cc:142
 msgid "The display format for the status line"
 msgstr "Ang anyo ng linyang estado"
 
-#: src/apt_options.cc:94
+#: src/apt_options.cc:145
 msgid "The display format for the header line"
 msgstr "Ang anyo ng linyang pang-ulo"
 
-#: src/apt_options.cc:103
+#: src/apt_options.cc:154
 msgid "Automatically upgrade installed packages"
 msgstr "Awtomatikong i-apgreyd ang mga paketeng naka-install"
 
-#: src/apt_options.cc:105
+#: src/apt_options.cc:156
 msgid "Remove obsolete package files after downloading new package lists"
 msgstr ""
 "Tanggalin ang mga laos na pakete matapos makuha ang bagong talaan ng pakete"
 
-#: src/apt_options.cc:107
+#: src/apt_options.cc:158
 msgid "URL to use to download changelogs"
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
-#: src/apt_options.cc:110
+#: src/apt_options.cc:161
 msgid "Display a preview of what will be done before doing it"
 msgstr "Ipakita muna ang mga balak gawin bago ito gawin"
 
-#: src/apt_options.cc:113
+#: src/apt_options.cc:164
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Kalimutan kung ang pakete ay \"bago\" kapag na-apdeyt ang talaan ng pakete"
 
-#: src/apt_options.cc:116
+#: src/apt_options.cc:167
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Kalimutan kung ang pakete ay \"bago\" kapag nag-install o nag-tangal ng "
 "pakete"
 
-#: src/apt_options.cc:119
+#: src/apt_options.cc:170
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Magbigay babala kapag sinubukang gumawa ng pribilehiyong gawa na hindi root"
 
-#: src/apt_options.cc:122
+#: src/apt_options.cc:173
 msgid "File to log actions into"
 msgstr "Tipunan na talaan ng mga ginawa"
 
-#: src/apt_options.cc:129
+#: src/apt_options.cc:180
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Awtomatikong ayusin ang mga dependensi ng pakete kapag pinili"
 
-#: src/apt_options.cc:131
+#: src/apt_options.cc:182
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Awtomatikong ayusin ang mga sirang pakete bago mag-install o mag-tanggal"
 
-#: src/apt_options.cc:133
+#: src/apt_options.cc:184
 msgid "Install Recommended packages automatically"
 msgstr "Mag-install ng Rekomendadong mga pakete ng awtomatiko"
 
-#: src/apt_options.cc:135
+#: src/apt_options.cc:186
 msgid "Remove unused packages automatically"
 msgstr "Tanggalin ang di ginagamit na mga pakete ng awtomatiko"
 
-#: src/apt_options.cc:137
+#: src/apt_options.cc:188
 msgid "Automatically remove unused packages matching this filter"
 msgstr ""
 "Tanggalin ng awtomatiko ang di ginagamit na pakete na tumbas nitong filter"
 
-#: src/apt_options.cc:185 src/mine/cmine.cc:247 src/mine/cmine.cc:320
-#: src/vscreen/vs_util.cc:53 src/vscreen/vs_util.cc:215
+#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ok"
 
-#: src/apt_options.cc:186 src/download_list.cc:57 src/mine/cmine.cc:249
-#: src/mine/cmine.cc:322 src/vscreen/vs_util.cc:215
+#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Kanselahin"
 
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Suhesyon"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "Instal"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "Instal"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "upgrade"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "upgrade"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "downgrade"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "downgrade"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Susunod"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed.  %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
 #: src/cmdline/cmdline_action.cc:36
 #, c-format
 msgid ""
@@ -204,50 +305,50 @@
 "Paunawa: pinili ang \"%s\" sa halip ng\n"
 "         bertwal na paketeng \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s ay naka-instoll na sa hiniling na bersyon (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s ay kasalukuyan hindi pa naka-instol, kaya hindi ito iinstolin muli.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Hindi naka-instol ang paketeng %s, kaya hindi ito tatanggalin\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Hindi naka-instol ang paketeng %s, hindi mapagbawal ang apgreyd\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Hindi maaaring i-apgreyd ang %s, hindi mapagbawal ang apgreyd\n"
 
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Paunawa: pinili na instolahin ang task \"%s: %s\"\n"
 
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 "Maari lamang itukoy ang bersyon ng pakete gamit ang utos na 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "Maaari lamang itukoy ang arkibo ng pakete gamit ang utos na 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -256,7 +357,7 @@
 "Hindi mahanap ang paketeng \"%s\", at higit sa 40\n"
 "na pakete ang may \"%s\" sa kanilang pangalan.\n"
 
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -265,13 +366,13 @@
 "Hindi mahanap ang paketeng \"%s\". Gayunpaman, ang sumusunod\n"
 "na mga pakete ay may \"%s\" sa kanilang pangalan:\n"
 
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Hindi makahanap ng pakete na kapareha ang pangalan o paglalarawan sa \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -281,7 +382,7 @@
 "at labis sa 40 ang mga pakete na naglalaman ng \"%s\"\n"
 "sa kanilang paglalarawan.\n"
 
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -290,6 +391,11 @@
 "Hindi nakahanap ng pakete na kapareha ng \"%s\".  Subalit, ang mga\n"
 "susunod na mga pakete ay may \"%s\" sa kanilang paglalarawan:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "Di tanggap na utos '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
@@ -311,13 +417,28 @@
 msgid "Del %s* %spartial/*\n"
 msgstr "Burahin %s*.%spartial/*\n"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_clean.cc:80
+#, c-format
+msgid "Del %s %s [%sB]\n"
+msgstr ""
+
+#: src/cmdline/cmdline_clean.cc:136
+#, fuzzy, c-format
+msgid "Would free %sB of disk space\n"
+msgstr "Maka libre ng %sB ang disk space"
+
+#: src/cmdline/cmdline_clean.cc:139
+#, fuzzy, c-format
+msgid "Freed %sB of disk space\n"
+msgstr "Maka libre ng %sB ang disk space"
+
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Hindi tanggap na operasyon %s"
 
-#: src/cmdline/cmdline_do_action.cc:206 src/cmdline/cmdline_simulate.cc:30
-#: src/cmdline/cmdline_upgrade.cc:89
+#: 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 "Hintuin.\n"
@@ -328,16 +449,16 @@
 msgstr ""
 "kumuha: kailangan niyong magbigay ng di kukulang sa isang pakete na kukunin\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Hindi mabasa ang talaan ng pagkukunan (source list)"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "Hindi mahanap ang paketeng nagngangalang \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -392,95 +513,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Ano 'to?  Aba'y elepanteng kinakain ng ahas, siyempre.\n"
 
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Hindi mabasa ang talaan ng pagkukunan"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "ngunit %s ay iinstolahin."
 
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "ngunit %s ay naka-instol at ito'y pinababayaan."
 
-#: src/cmdline/cmdline_prompt.cc:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ngunit %s ay naka-instol."
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "ngunit hindi ito maaaring ma-instol."
 
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " na paketeng birtwal."
 
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " o"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Ang mga sumusunod na pakete ay SIRA:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Ang mga sumusunod na mga pakete ay di ginagamit at TATANGGALIN:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "Ang mga sumusunod na mga pakete ay awtomatikong pababayaan:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Ang mga sumusunod na BAGONG mga pakete ay awtomatikong iinstolahin:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Ang mga sumusunod na mga pakete ay awtomatikong TATANGGALIN:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ang mga sumusunod na mga pakete ay I-DA-DOWNGRADE:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "Ang mga sumusunod na mga pakete ay pinabayaan:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "Ang mga sumusunod na mga pakete ay IINSTOLAHIN MULI:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "Ang mga sumusunod na BAGONG mga pakete ay iinstolahin:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "Ang mga sumusunod na mga pakete ay TATANGGALIN:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "Ang mga sumusunod na mga pakete ay ia-apgreyd:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Ang sumusunod na mga paketeng ESENSIYAL ay TATANGGALIN!\n"
 
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Ang sumusunod na mga paketeng ESENSIYAL ay MASISIRA nitong gagawin:\n"
 
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -489,16 +610,16 @@
 "BABALA: Ang gagawing ito ay maaaring makasira sa inyong sistema!\n"
 "        HUWAG magpatuloy kung di niyo alam ng TIYAK ang inyong ginagawa!\n"
 
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Alam ko na ito'y masamang ideya"
 
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Upang magpatuloy, ibigay ang pariralang \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:371
+#: src/cmdline/cmdline_prompt.cc:375
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -516,109 +637,205 @@
 "ito.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:380 src/ui.cc:859 src/vscreen/vs_util.cc:125
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
 msgid "Yes"
 msgstr "Oo"
 
-#: src/cmdline/cmdline_prompt.cc:380 src/ui.cc:859 src/vscreen/vs_util.cc:125
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
 msgid "No"
 msgstr "Hindi"
 
-#: src/cmdline/cmdline_prompt.cc:384
+#: src/cmdline/cmdline_prompt.cc:388
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Nais ba ninyong di pansinin ang babalang ito at magpatuloy pa rin?\n"
 
-#: src/cmdline/cmdline_prompt.cc:385
+#: src/cmdline/cmdline_prompt.cc:389
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 "Upang magpatuloy, ibigay ang pariralang \"%s\"; upang huminto, ibigay ang \"%"
 "s\": "
 
-#: src/cmdline/cmdline_prompt.cc:396
+#: src/cmdline/cmdline_prompt.cc:400
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Di kilalang input.  Ipasok ang \"%s\" o \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:501
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Ang sumusunod na mga pakete ay REKOMENDADO pero HINDI iluluklok:\n"
 
-#: src/cmdline/cmdline_prompt.cc:507
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Ang sumusunod na mga pakete ay MINUMUNGKAHI pero HINDI iluluklok:\n"
 
-#: src/cmdline/cmdline_prompt.cc:512
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Walang paketeng iinstolahin, iaapgreyd, o tatanggalin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:514
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu na paketeng inapgreyd, %lu bagong luklok, "
 
-#: src/cmdline/cmdline_prompt.cc:518
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu iniluklok muli, "
 
-#: src/cmdline/cmdline_prompt.cc:520
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu dinawngreyd, "
 
-#: src/cmdline/cmdline_prompt.cc:522
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu na tatanggalin at %lu hindi inapgreyd.\n"
 
-#: src/cmdline/cmdline_prompt.cc:529
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibo. "
 
-#: src/cmdline/cmdline_prompt.cc:532
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Kailangan kumuha ng %sB ng arkibo. "
 
-#: src/cmdline/cmdline_prompt.cc:539
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Matapos magbuklat ay %sB ay gagamitin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:542
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Matapos magbuklat ay %sB ay mapapalaya.\n"
 
-#: src/cmdline/cmdline_prompt.cc:588
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "Di tanggap na utos '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:663
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Walang paketeng ipapakita - ibigay ang mga pakete pagkatapos ng 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_prompt.cc:696
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Pindutin ang Enter upang tumuloy."
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Walang nahanap na mga pakete -- ibigay ang mga pakete pagkatapos ng 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:732
+#: src/cmdline/cmdline_prompt.cc:610
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Pindutin ang Enter upang tumuloy."
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Ang anyo ng ipapakita para sa pagtanaw ng mga pakete"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Iluklok/tanggalin ang mga pakete"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Ang mga sumusunod na BAGONG mga pakete ay awtomatikong iinstolahin:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Iluklok/tanggalin ang mga pakete"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^Kalimutan ang mga bagong pakete"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - ilagay ang pakete sa pag kakahawak\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markahanlagi     - Markahan ang pakete para kusang mag instal\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " alisin-ang-marka-lagi   - Markahan ang pakete para i-manual instal\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "rekomedasyon"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Nais niyo bang magpatuloy? [O/h/?] "
 
@@ -688,85 +905,111 @@
 "Hindi ipapakita ang mga pagbabago sa laki.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:794
+#: src/cmdline/cmdline_prompt.cc:797
+#, c-format
+msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
+msgstr ""
+"Di tanggap na sagot.  Pakibigay ng tanggap na utos o '?' para sa tulong.\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_resolver.cc:108
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:110
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:112
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Lumabas sa programa"
+
+#: src/cmdline/cmdline_resolver.cc:114
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:116
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
 msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Utusan:\n"
-"  y: magpatuloy sa installation\n"
-"  n: agas and lisanin\n"
-"  i: ipakita ang impormasyon tungkol sa isa o lahat na pakete;\n"
-"     ang pangalan ng pakete ay kailangan sundan ng 'i'\n"
-"  c: ipakita ang Debian changelogs ng isa o lahat ng pakete;\n"
-"     ang pangalan ng pakete ay kailangan sundan ng 'c'\n"
-"  d: ipakita ang impormasyon ng dependency\n"
-"  s: ipakita ang pagbabagong sukat ng mga pakete\n"
-"  v: ipakita ang salin\n"
-"  e: ipasok ang buong visual interface\n"
-"\n"
-"  Pwede mo specify ang pagbabago sa isang kumpol ng mga aktion na pakete.\n"
-"  Para gawin, ilagay ang aksyon karaktÃ©r kasunod ng isa o lahat na pangalan "
-"ng pakete\n"
-"o patterns.  Ang aksyon ay bisa sa lahat ng mga pakete. (pwede ka mag "
-"specify\n"
-"ng karagdagan na aksyon; bawat isa ay mag kakabisa sa lahat ng pakete na "
-"kasunod nito)\n"
-"\n"
-"Aksyon:\n"
-"  + : Install\n"
-"  - : Alisin\n"
-"  _ : Purge\n"
-"  = : Pigilin\n"
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
+#, 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
+msgid "Accept this solution? [Y/n/q/?] "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:212
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:818
+#: src/cmdline/cmdline_resolver.cc:222
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Ang mga sumusunod na pakete ay SIRA:"
+
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
 #, c-format
-msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
+msgid "Unable to open %s for writing"
+msgstr "Hindi ma-buksan ang %s para sulatan"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Error sa pagsulat ng state file"
+
+#: src/cmdline/cmdline_resolver.cc:250
+#, 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_search.cc:78
-#, c-format
-msgid "search: You must provide at least one search term\n"
+#: src/cmdline/cmdline_resolver.cc:260
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:288
+#, 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
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:302
+msgid "No more solutions."
 msgstr ""
-"paghanap: Dapat magbigay kayo ng di kukulang sa isang terminong hahanapin\n"
 
-#: src/cmdline/cmdline_show_broken.cc:114
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
-msgid ""
-"Some packages had unmet dependencies.  This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
+msgid "search: You must provide at least one search term\n"
 msgstr ""
-"May mga paketeng may kulang na dependensiya.  Maaaring kayo'y humiling\n"
-"ng imposibleng sitwasyon o kung kayo ay gumagamit ng pamudmod na unstable\n"
-"ay may mga kailangang mga pakete na hindi pa nalilikha o linipat mula sa\n"
-"Incoming.\n"
+"paghanap: Dapat magbigay kayo ng di kukulang sa isang terminong hahanapin\n"
 
-#: src/cmdline/cmdline_show_broken.cc:115
+#: src/cmdline/cmdline_show_broken.cc:113
 #, c-format
 msgid "The following packages have unmet dependencies:\n"
 msgstr "Ang mga sumusunod na pakete ay may kulang na dependensiya:\n"
@@ -775,7 +1018,7 @@
 msgid "not installed"
 msgstr "hindi naka-instol"
 
-#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:237
+#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
 #: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "binuklat"
@@ -792,7 +1035,7 @@
 msgid "not installed (configuration files remain)"
 msgstr "hindi naka-instol (may mga tipunang pagkaayos na naiwan)"
 
-#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:245
+#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
 #: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "naka-instol"
@@ -850,7 +1093,7 @@
 msgstr "Pakete: "
 
 #: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
-#: src/pkg_columnizer.cc:93
+#: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "Katayuan"
 
@@ -858,12 +1101,12 @@
 msgid "Provided by"
 msgstr "Inihanda ni"
 
-#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:107
+#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Pangunahin: "
 
 #: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:107
+#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "oo"
 
@@ -887,7 +1130,7 @@
 msgid "Version: "
 msgstr "Bersyon: "
 
-#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Prioridad: "
 
@@ -896,11 +1139,11 @@
 msgid "N/A"
 msgstr "N/A"
 
-#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:116
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Hanay: "
 
-#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:117
+#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Tagapamahala: "
 
@@ -960,16 +1203,16 @@
 msgid "Provides"
 msgstr "Provides"
 
-#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:99
+#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "Diskripyson: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Would /download/install/remove ang pakete.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Internal Error, Ordering ay hindi natapos"
 
@@ -978,27 +1221,27 @@
 msgid "E: The update command takes no arguments\n"
 msgstr "E: Ang update command ay kulang sa argumento\n"
 
-#: src/cmdline/cmdline_util.cc:67
+#: src/cmdline/cmdline_util.cc:69
 #, c-format
 msgid "No candidate version found for %s\n"
 msgstr "Walang kandidatong version na nakita %s\n"
 
-#: src/cmdline/cmdline_util.cc:81
+#: src/cmdline/cmdline_util.cc:83
 #, c-format
 msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
 msgstr "Hindi makita ang arkibo \"%s\" para sa pakete \"%s\"\n"
 
-#: src/cmdline/cmdline_util.cc:91
+#: src/cmdline/cmdline_util.cc:93
 #, c-format
 msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgstr "Hindi makita ang version \"%s\" para sa pakete \"%s\"\n"
 
-#: src/cmdline/cmdline_util.cc:97
+#: src/cmdline/cmdline_util.cc:99
 #, c-format
 msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
 msgstr "Internal error: maling value %i na dumaan cmdline_find_ver!\n"
 
-#: src/cmdline/cmdline_util.cc:127
+#: src/cmdline/cmdline_util.cc:129
 #, c-format
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr ""
@@ -1012,28 +1255,24 @@
 msgid "UNAVAILABLE"
 msgstr "HINDI AVAILABLE"
 
-#: src/download_bar.cc:55 src/download_list.cc:251
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
 #, c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr ""
-"Paki insert ang mga sumusunod na disc sa drive \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Paki insert ang disc na may label \"%s\" sa loob ng drive \"%s\""
 
-#: src/download_bar.cc:74 src/generic/acqprogress.cc:57
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Tumama "
 
-#: src/download_bar.cc:87
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Kinukuha "
 
-#: src/download_bar.cc:100
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Nakuha "
 
-#: src/download_bar.cc:154
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "Kinukuha..."
 
@@ -1041,7 +1280,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "Hindi mabasa ang pinagmulang listahan ng mga pakete"
 
-#: src/download.cc:104 src/download.cc:323
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "Hindi maisara ang listahan ng directory..ikaw ba'y root?"
 
@@ -1053,29 +1292,33 @@
 msgid "View the progress of the package list update"
 msgstr "Tingnan ang update na progreso ng mga pakete sa listahan"
 
-#: src/download.cc:161
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "Hindi malinis ng maayos ang listahan ng directories"
 
-#: src/download.cc:178 src/ui.cc:1238
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "Binubura ang matagal ng nakuhang mga files"
 
-#: src/download.cc:183
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Binubura ang matagal ng nakuhang mga files\n"
 
-#: src/download.cc:225
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "Hindi ma-buksan ang %s para mailista ang mga aksyon"
 
-#: src/download.cc:231
+#: src/download.cc:230
 msgid "log report"
 msgstr "log-report"
 
-#: src/download.cc:232
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1087,77 +1330,77 @@
 "dpkg problems ay hindi kumpleto.\n"
 "\n"
 
-#: src/download.cc:233
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "Ee-install ang %li pakete, at tanggalin %li mga pakete.\n"
 
-#: src/download.cc:235
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "%sB na disk space ang gagamitin\n"
 
-#: src/download.cc:238
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "%sB bytes of disk space will be freed\n"
 
-#: src/download.cc:246
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[UPGRADE] %s %s -> %s\n"
 
-#: src/download.cc:250
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[DOWNGRADE] %s %s -> %s\n"
 
-#: src/download.cc:260
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "TANGGALIN"
 
-#: src/download.cc:266
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "INSTALL"
 
-#: src/download.cc:269
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "REINSTALL"
 
-#: src/download.cc:272
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "PIGILIN"
 
-#: src/download.cc:275
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "SIRA"
 
-#: src/download.cc:278
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "TANGGALIN, HINDI NAGAMIT"
 
-#: src/download.cc:281
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "TANGGALIN, DEPENDENCIES"
 
-#: src/download.cc:284
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "INSTALL, DEPENDENCIES"
 
-#: src/download.cc:287
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "PIGILIN, DEPENDENCIES"
 
-#: src/download.cc:289
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:293
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:296
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1168,14 +1411,19 @@
 "\n"
 "Log ay tapos na.\n"
 
-#: src/download.cc:331
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "Kinukuha ang mga pakete"
 
-#: src/download.cc:332
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Tingnan ang progreso ng paketeng kinukuha"
 
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pakete: "
+
 #: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Internal error: hindi ma-generate ang listahan ng paketeng kukunin"
@@ -1191,7 +1439,7 @@
 "Ayyyk!!!  Mayhindi magandang nanyari habang ini-install ang mga pakete.  "
 "Sinusubukang ma-recover:"
 
-#: src/download.cc:477 src/pkg_item.cc:412
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "Pindutin ang pabalik upang magpatuloy.\n"
 
@@ -1202,62 +1450,62 @@
 "Hindi ma-regain ang system lock!  (Siguro may ibang apt or dpg ang "
 "tumatakbo?)"
 
-#: src/download_item.cc:65 src/download_item.cc:69 src/download_item.cc:99
-#: src/generic/acqprogress.cc:230
+#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/generic/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr " [Nagtatrabaho]"
 
-#: src/download_item.cc:103 src/download_list.cc:269
+#: src/download_item.cc:104 src/download_list.cc:283
 msgid "[Hit]"
 msgstr "[Pindut]"
 
-#: src/download_item.cc:103 src/download_list.cc:289
+#: src/download_item.cc:104 src/download_list.cc:303
 msgid "[Downloaded]"
 msgstr "[Nakuha]"
 
-#: src/download_list.cc:48
+#: src/download_list.cc:51
 #, c-format
 msgid "Downloaded %sB in %s (%sB/s)."
 msgstr "Nakuha %sB ng %s (%sB/s)."
 
-#: src/download_list.cc:55
+#: src/download_list.cc:57
+#, c-format
+msgid "%n%nSome files were not downloaded successfully."
+msgstr ""
+
+#: src/download_list.cc:68
 msgid "Continue"
 msgstr "Magpatuloy"
 
-#: src/download_list.cc:161 src/download_screen.cc:201
+#: src/download_list.cc:175 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Pangkalahatan progreso: "
 
-#: src/download_list.cc:180 src/download_screen.cc:216
+#: src/download_list.cc:194 src/download_screen.cc:218
 #, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s natitira)"
 
-#: src/download_list.cc:182
+#: src/download_list.cc:196
 #, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (stalled)"
 
-#: src/download_list.cc:184
+#: src/download_list.cc:198
 #, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#: src/download_list.cc:309
+#: src/download_list.cc:323
 msgid "[IGNORED]"
 msgstr "[HAYAAN]"
 
-#: src/download_list.cc:313
+#: src/download_list.cc:329
 msgid "[ERROR]"
 msgstr "[ERROR]"
 
-#: src/download_screen.cc:55
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Paki insert ang disc na may label \"%s\" sa loob ng drive \"%s\""
-
-#: src/download_screen.cc:179
+#: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
 msgstr "Nakuha %sB sa %ss (%sB/s)."
@@ -1270,24 +1518,24 @@
 msgid "Couldn't open for writing"
 msgstr "Hindi mabuksan para masulatan"
 
-#: src/generic/acqprogress.cc:81
+#: src/generic/acqprogress.cc:87
 msgid "Get:"
 msgstr "Kunin:"
 
-#: src/generic/acqprogress.cc:112
+#: src/generic/acqprogress.cc:118
 msgid "Ign "
 msgstr "Ign "
 
-#: src/generic/acqprogress.cc:116
+#: src/generic/acqprogress.cc:122
 msgid "Err "
 msgstr "Err "
 
-#: src/generic/acqprogress.cc:136
+#: src/generic/acqprogress.cc:142
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Kinukuha %sB sa %s (%sB/s)\n"
 
-#: src/generic/acqprogress.cc:276
+#: src/generic/acqprogress.cc:282
 #, c-format
 msgid ""
 "Media Change: Please insert the disc labeled '%s' in the drive '%s' and "
@@ -1296,113 +1544,108 @@
 "Nagbago ng Media: Paki pasok ang disk na may label na '%s' sa drive '%s' at "
 "pindutin ang enter\n"
 
-#: src/generic/aptcache.cc:248
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "Hindi ma-buksan ang Aptitude extended state file"
 
-#: src/generic/aptcache.cc:255 src/generic/aptcache.cc:307
-#: src/generic/aptcache.cc:309
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Binabasa ang impormasyon ng extended state"
 
-#: src/generic/aptcache.cc:315 src/generic/aptcache.cc:389
-#: src/generic/aptcache.cc:392
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Naghahanda ang package states"
 
-#: src/generic/aptcache.cc:503
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "Hindi ma-buksan ang Aptitude state file"
 
-#: src/generic/aptcache.cc:507 src/generic/aptcache.cc:562
-#: src/generic/aptcache.cc:565
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "Nag-susulat ng extended state information"
 
-#: src/generic/aptcache.cc:544
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 "May Internal buffer overflow sa pakete \"%s\" habang nag-susulat ng state "
 "file"
 
-#: src/generic/aptcache.cc:553
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "Hindi maka sulat ng state file"
 
-#: src/generic/aptcache.cc:570
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "Error sa pagsulat ng state file"
 
-#: src/generic/aptcache.cc:586
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "hindi ma-palitan ang lumang state file"
 
-#: src/generic/aptcache.cc:962
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Hindi ma i-ayos ang dependecies, may mga pakete na hindi ma-install"
 
-#: src/generic/aptcache.cc:1322
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Ang source ng listahan ay hindi mabasa."
 
-#: src/generic/aptcache.cc:1329
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Ang listahan ng pakete o status file ay hindi ma-parsed o ma buksan."
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Pwede mong i-update ang listahan ng mga pakete para ma i-ayos ang mga "
 "nawawalang files"
 
-#: src/generic/apt.cc:143
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "Hindi ma-buksan ang %s para sulatan"
-
-#: src/generic/apt.cc:153
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "Hindi ma-palitan ang %s ng bagong configuration file"
 
-#: src/generic/apt.cc:232
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr "Babala: hindi ma-lock ang cache file.  Bubuksan ng read-only mode"
 
-#: src/generic/matchers.cc:779
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "Hindi magkatulad '('"
 
-#: src/generic/matchers.cc:869 src/generic/matchers.cc:948
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Di-kilalang anyo ng dependency: %s"
 
-#: src/generic/matchers.cc:930
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Di-kilalang anyo ng aksyon: %s"
 
-#: src/generic/matchers.cc:997
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Hindi kilalang prayoridad %s"
 
-#: src/generic/matchers.cc:1019
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Di-kilalang anyo ng pattern: %c"
 
-#: src/generic/matchers.cc:1064
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "Hindi inaasahang blangko na expression"
 
-#: src/generic/matchers.cc:1099
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "Badly formed expression"
 
-#: src/generic/matchers.cc:1128
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "Hindi inaasahan ')'"
 
@@ -1426,7 +1669,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "Hindi makuha ang value ng $HOME, gamit ang TMPDIR (insecure)"
 
-#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "ChangeLog ng %s"
@@ -1460,11 +1703,11 @@
 msgid "Multiple descriptions found for group %s, ignoring one"
 msgstr "Maraming deskripsyon ang nakita para sa grupo %s, hayaan ang isa"
 
-#: src/generic/tasks.cc:294
+#: src/generic/tasks.cc:295
 msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
 msgstr "Hindi mabuksan ang /usr/share/tasksel/debian-tasks.desc"
 
-#: src/generic/tasks.cc:301 src/generic/tasks.cc:343 src/generic/tasks.cc:345
+#: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346
 msgid "Reading task descriptions"
 msgstr "Binabasa ang deskripsyon na gagawin"
 
@@ -1637,17 +1880,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Di-valid na pag-uri-uriin na anyo ng patakaran '%s'"
 
-#: src/main.cc:68
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compiled sa %s %s\n"
 
-#: src/main.cc:71
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compiler: g++ %s\n"
 
-#: src/main.cc:74
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1656,7 +1899,7 @@
 "\n"
 "NSalin ng tungayaw: %s\n"
 
-#: src/main.cc:76
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1665,22 +1908,22 @@
 "\n"
 "Salin ng tingayaw: %s\n"
 
-#: src/main.cc:78
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ salin: %s\n"
 
-#: src/main.cc:84
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Pag-gamit: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:86
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [mga option] <aksyon> ..."
 
-#: src/main.cc:88
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1690,43 +1933,43 @@
 "pamamaraan):\n"
 "\n"
 
-#: src/main.cc:89
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Install/upgrade ang mga pakete\n"
 
-#: src/main.cc:90
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Alisin ang pakete\n"
 
-#: src/main.cc:91
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 " purge        - Alisin ang pakete at ang kanilang configuration files\n"
 
-#: src/main.cc:92
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - ilagay ang pakete sa pag kakahawak\n"
 
-#: src/main.cc:93
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Tanggalin ang pagkakawak sa pakete\n"
 
-#: src/main.cc:94
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markahanlagi     - Markahan ang pakete para kusang mag instal\n"
 
-#: src/main.cc:95
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " alisin-ang-marka-lagi   - Markahan ang pakete para i-manual instal\n"
 
-#: src/main.cc:100
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1735,17 +1978,17 @@
 " forbid-version - Ipinagbawal ng aptitude mula upgrading sa partikular na "
 "paketeng salin.\n"
 
-#: src/main.cc:101
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Listahan ng na-kuha na bago/upgradable pakete\n"
 
-#: src/main.cc:102
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Gawin ang safe na upgrade\n"
 
-#: src/main.cc:103
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1754,59 +1997,59 @@
 " dist-upgrade - Magsagawa ng upgrade, marahil installing at alisin ang mga "
 "pakete\n"
 
-#: src/main.cc:104
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Limutin kung ano ang mga pakete na  \"bago\"\n"
 
-#: src/main.cc:105
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Hanapin ang pakete sa pangalan at/o expression\n"
 
-#: src/main.cc:106
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Pakita ang detalyadong impormasyon tungkol sa pakete\n"
 
-#: src/main.cc:107
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Burahin ang nakuhang pakete files\n"
 
-#: src/main.cc:108
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Burahin ang lumang nakuhang pakete files\n"
 
-#: src/main.cc:109
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Tingnan ang changelog ng pakete\n"
 
-#: src/main.cc:110
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Kuhain ang .deb file para sa pakete\n"
 
-#: src/main.cc:112
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  Options:\n"
 
-#: src/main.cc:113
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Ang tulong na ito\n"
 
-#: src/main.cc:114
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Magsagawa ng kunwaring aksyon, pero wag gawin ng toto ang "
 "pagsagawa sa kanila.\n"
 
-#: src/main.cc:115
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1814,12 +2057,12 @@
 " -d             Kunin ang pakete lamang, wag i-instal o tanggalin ang kahit "
 "na ano.\n"
 
-#: src/main.cc:116
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Laging mag prompt para sa compermasyon o aksyon\n"
 
-#: src/main.cc:117
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1827,7 +2070,7 @@
 " -y             Mag panggap na ang sagot sa simpleng tanong na oo/hindi ay "
 "'oo\n"
 
-#: src/main.cc:118
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1836,7 +2079,7 @@
 " -F format      ilagay ang format para i-display ang nahanap na resulta; "
 "tingnan ang manual\n"
 
-#: src/main.cc:119
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1844,7 +2087,7 @@
 " -O order       ilagay kung paano ang nahanap na resulta ayon sa pag-uri-"
 "uri; tingnan ang manual\n"
 
-#: src/main.cc:120
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -1852,18 +2095,18 @@
 " -w width       ilagay ang lapad ng display para sa formatting ng nahanap na "
 "resulta\n"
 
-#: src/main.cc:121
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Agresibong sinusubukan na ayusin ang nabasag na mga pakete.\n"
 
-#: src/main.cc:122
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Pakita kung anong bersyon ng pakete ang e i-instal.\n"
 
-#: src/main.cc:123
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -1871,13 +2114,13 @@
 " -D             Pakita ang dependencies ng otomatikaling nabagong mga "
 "pakete.\n"
 
-#: src/main.cc:124
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 " -Z\t\t    Ipakita ang pagbabago sa installed na sukat ng bawat pakete.\n"
 
-#: src/main.cc:125
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -1885,21 +2128,21 @@
 " -v             Pakita ang karagdagang impormasyon. (siguro supplied ng "
 "maraming ulit)\n"
 
-#: src/main.cc:126
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 " -t [release]   Itakda ang paglaya kung saan ang pakete ay i-installed\n"
 
-#: src/main.cc:127
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 " -o key=val     Diretstong ilagay ang pangalan ng configuration option "
 "'key'\n"
 
-#: src/main.cc:128
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1908,202 +2151,210 @@
 " --with(out)-recommends\tSpecify kahit na maukol ng rekomenda \n"
 "                matibay na dependencies\n"
 
-#: src/main.cc:129
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fname: Basahin ang aptitude extended status info mula sa fname.\n"
 
-#: src/main.cc:130
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Kuhain ang bagong pakete sa simula.\n"
 
-#: src/main.cc:131
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Magsagawa ng install run sa simula.\n"
 
-#: src/main.cc:133
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 "                  Ang aptitude na ito ay walang kapanyarihang Super "
 "Kalabaw.\n"
 
-#: src/main.cc:254
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o kailangan ng argumento sa hubog na key=value, nakuha %s"
 
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "KAKAIBA: di-kilala na option code natanggap\n"
 
-#: src/main.cc:318
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Tanging isa sa -u at -i ang maaaring specified\n"
 
-#: src/main.cc:326
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "-u at -i ay maaring hindi specified sa command-line na pamamaraan (eg, with "
 "'install')"
 
-#: src/main.cc:337
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u at -i hindi siguro na specified na merong command"
 
-#: src/main.cc:392
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Hindi kilalang command \"%s\"\n"
 
-#: src/main.cc:400
+#: src/main.cc:412 src/main.cc:469
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:417 src/main.cc:474
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:424
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Hindi valid na option para sa interactive mode: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
-#: src/mine/cmine.cc:85
+#: src/mine/cmine.cc:93
 #, c-format
 msgid "%i/%i mines  %d %s"
 msgstr "%i/%i mines  %d %s"
 
-#: src/mine/cmine.cc:89 src/mine/cmine.cc:96
+#: src/mine/cmine.cc:97 src/mine/cmine.cc:104
 msgid "second"
 msgstr "segundo"
 
-#: src/mine/cmine.cc:89 src/mine/cmine.cc:96
+#: src/mine/cmine.cc:97 src/mine/cmine.cc:104
 msgid "seconds"
 msgstr "mga segundo"
 
-#: src/mine/cmine.cc:93
+#: src/mine/cmine.cc:101
 #, c-format
 msgid "Minesweeper    %s in %d %s"
 msgstr "Taga-walis ng ginto    %s in %d %s"
 
-#: src/mine/cmine.cc:94
+#: src/mine/cmine.cc:102
 msgid "Won"
 msgstr "Nanalo"
 
-#: src/mine/cmine.cc:94
+#: src/mine/cmine.cc:102
 msgid "Lost"
 msgstr "Natalo"
 
-#: src/mine/cmine.cc:111 src/ui.cc:1187
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "Taga-walis ng ginto"
 
-#: src/mine/cmine.cc:123 src/mine/cmine.cc:160
+#: src/mine/cmine.cc:131 src/mine/cmine.cc:168
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "hindi ma-buksan na file \"%s\""
 
-#: src/mine/cmine.cc:137
+#: src/mine/cmine.cc:145
 #, c-format
 msgid "Could not load game from %s"
 msgstr "Hindi ma-load ang laro galing sa %s"
 
-#: src/mine/cmine.cc:187
+#: src/mine/cmine.cc:195
 msgid "The board height must be a number"
 msgstr "Ang taas ng tabla ay kailangan numero"
 
-#: src/mine/cmine.cc:199
+#: src/mine/cmine.cc:207
 msgid "The board width must be a number"
 msgstr "Ang lapad ng tabla ay kailangan numero"
 
-#: src/mine/cmine.cc:212
+#: src/mine/cmine.cc:220
 msgid "The number of mines must be a number"
 msgstr "Ang numero ng ginto ay kailangan numero"
 
-#: src/mine/cmine.cc:232
+#: src/mine/cmine.cc:240
 msgid "Setup custom game"
 msgstr "Mag-setup ng custom na laro"
 
-#: src/mine/cmine.cc:235
+#: src/mine/cmine.cc:243
 msgid "Height of board: "
 msgstr "Taas ng board: "
 
-#: src/mine/cmine.cc:239
+#: src/mine/cmine.cc:247
 msgid "Width of board: "
 msgstr "Lapad ng board: "
 
-#: src/mine/cmine.cc:243
+#: src/mine/cmine.cc:251
 msgid "Number of mines: "
 msgstr "Bilang ng mines: "
 
-#: src/mine/cmine.cc:308
+#: src/mine/cmine.cc:316
 msgid "Choose difficulty level"
 msgstr "Pumili sa level ng hirap"
 
-#: src/mine/cmine.cc:310
+#: src/mine/cmine.cc:318
 msgid "Easy"
 msgstr "Padali"
 
-#: src/mine/cmine.cc:311
+#: src/mine/cmine.cc:319
 msgid "Medium"
 msgstr "Katamtaman"
 
-#: src/mine/cmine.cc:312
+#: src/mine/cmine.cc:320
 msgid "Hard"
 msgstr "Mahirap"
 
-#: src/mine/cmine.cc:313
+#: src/mine/cmine.cc:321
 msgid "Custom"
 msgstr "Custom"
 
-#: src/mine/cmine.cc:403
+#: src/mine/cmine.cc:411
 msgid "You have won."
 msgstr "Nanalo ka"
 
-#: src/mine/cmine.cc:406
+#: src/mine/cmine.cc:414
 msgid "You lose!"
 msgstr "Natalo ka!"
 
-#: src/mine/cmine.cc:411
+#: src/mine/cmine.cc:419
 msgid "You die...  --More--"
 msgstr "Namatay ka...  --Marami--"
 
-#: src/mine/cmine.cc:424
+#: src/mine/cmine.cc:432
 msgid "The spikes were poisoned!  The poison was deadly..  --More--"
 msgstr "Ang spikes ay nalason!  Ang lason ay nakamamatay..  --Higit--"
 
-#: src/mine/cmine.cc:427
+#: src/mine/cmine.cc:435
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "Ikaw ay nalapag sa lipon ng matalas na bakal na spikes!  --Higit--"
 
-#: src/mine/cmine.cc:430
+#: src/mine/cmine.cc:438
 msgid "You fall into a pit!  --More--"
 msgstr "Ikaw ay bumagsak sa hukay!  --Higit--"
 
-#: src/mine/cmine.cc:433
+#: src/mine/cmine.cc:441
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "BLAGA!  Ikaw ay naka tapak sa paputok.  --Marami--"
 
-#: src/mine/cmine.cc:438
+#: src/mine/cmine.cc:446
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "Ang dart ay nalason!  Ang lason ay nakamamatay...  --Higit--"
 
-#: src/mine/cmine.cc:440
+#: src/mine/cmine.cc:448
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr ""
 "Isang maliit na dart ang bumaril sa 'yo!  Ikaw ay tinamaan ng maliit na "
 "dart!  --Higit--"
 
-#: src/mine/cmine.cc:444
+#: src/mine/cmine.cc:452
 msgid "You turn to stone... --More--"
 msgstr "Ikaw ay naging bato... --Marami--"
 
-#: src/mine/cmine.cc:446
+#: src/mine/cmine.cc:454
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "Paghipo sa bangkay na cockatrice ay mali at nakamamatay.  --Higit--"
 
-#: src/mine/cmine.cc:448
+#: src/mine/cmine.cc:456
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "Ikaw ay nakadama ng bangkay na cockatrice.  --Higit--"
 
-#: src/mine/cmine.cc:452
+#: src/mine/cmine.cc:460
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
@@ -2111,266 +2362,266 @@
 "Click! Nakalabit mo ang umiikot na boulder na bitag! Ikaw at natinamaan ng "
 "boulder! --Higit--"
 
-#: src/mine/cmine.cc:462
+#: src/mine/cmine.cc:470
 msgid "sleep"
 msgstr "tulog"
 
-#: src/mine/cmine.cc:465
+#: src/mine/cmine.cc:473
 msgid "striking"
 msgstr "hinahampas"
 
-#: src/mine/cmine.cc:468
+#: src/mine/cmine.cc:476
 msgid "death"
 msgstr "kamatayan"
 
-#: src/mine/cmine.cc:471
+#: src/mine/cmine.cc:479
 msgid "polymorph"
 msgstr "polymorph"
 
-#: src/mine/cmine.cc:474
+#: src/mine/cmine.cc:482
 msgid "magic missile"
 msgstr "salamangkang missile"
 
-#: src/mine/cmine.cc:477
+#: src/mine/cmine.cc:485
 msgid "secret door detection"
 msgstr "sekretong pintong detection"
 
-#: src/mine/cmine.cc:480
+#: src/mine/cmine.cc:488
 msgid "invisibility"
 msgstr "di-maaaring makita"
 
-#: src/mine/cmine.cc:483
+#: src/mine/cmine.cc:491
 msgid "cold"
 msgstr "lamig"
 
-#: src/mine/cmine.cc:489
+#: src/mine/cmine.cc:497
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "Ang iyong wand ng %s nabasag pirapiraso at sumabog!  --Higit--"
 
-#: src/mine/cmine.cc:495
+#: src/mine/cmine.cc:503
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "Ikaw ay jolted na surge ng elektrisidad!  --Higit--"
 
-#: src/mine/cmine.cc:599
+#: src/mine/cmine.cc:607
 msgid "Enter the filename to load: "
 msgstr "ilagay ang filename para i-load: "
 
-#: src/mine/cmine.cc:606
+#: src/mine/cmine.cc:614
 msgid "Enter the filename to save: "
 msgstr "ilagay ang filename para ma-save:"
 
-#: src/mine/cmine.cc:616
+#: src/mine/cmine.cc:624
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
-#: src/pkg_columnizer.cc:87
+#: src/pkg_columnizer.cc:81
 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:90 src/ui.cc:1643
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Pakete"
 
-#: src/pkg_columnizer.cc:91
+#: src/pkg_columnizer.cc:85
 msgid "InstSz"
 msgstr "InstSz"
 
-#: src/pkg_columnizer.cc:92
+#: src/pkg_columnizer.cc:86
 msgid "DebSz"
 msgstr "DebSz"
 
-#: src/pkg_columnizer.cc:94
+#: src/pkg_columnizer.cc:88
 msgid "Action"
 msgstr "Aksyon"
 
-#: src/pkg_columnizer.cc:95
+#: src/pkg_columnizer.cc:89
 msgid "Description"
 msgstr "Deskripsyon"
 
-#: src/pkg_columnizer.cc:96
+#: src/pkg_columnizer.cc:90
 msgid "InstVer"
 msgstr "InstVer"
 
-#: src/pkg_columnizer.cc:97
+#: src/pkg_columnizer.cc:91
 msgid "CandVer"
 msgstr "CandVer"
 
-#: src/pkg_columnizer.cc:98
+#: src/pkg_columnizer.cc:92
 msgid "LongState"
 msgstr "LongState"
 
-#: src/pkg_columnizer.cc:99
+#: src/pkg_columnizer.cc:93
 msgid "LongAction"
 msgstr "MatagalNaAksyon"
 
-#: src/pkg_columnizer.cc:100
+#: src/pkg_columnizer.cc:94
 msgid "Maintainer"
 msgstr "Tagapamahala"
 
-#: src/pkg_columnizer.cc:101
+#: src/pkg_columnizer.cc:95
 msgid "Priority"
 msgstr "Prayoridad"
 
-#: src/pkg_columnizer.cc:102
+#: src/pkg_columnizer.cc:96
 msgid "Section"
 msgstr "Seksyon"
 
-#: src/pkg_columnizer.cc:103
+#: src/pkg_columnizer.cc:97
 msgid "RC"
 msgstr "RC"
 
-#: src/pkg_columnizer.cc:104
+#: src/pkg_columnizer.cc:98
 msgid "Auto"
 msgstr "Auto"
 
-#: src/pkg_columnizer.cc:105
+#: src/pkg_columnizer.cc:99
 msgid "Tag"
 msgstr "Tag"
 
-#: src/pkg_columnizer.cc:108
+#: src/pkg_columnizer.cc:102
 msgid "ProgName"
 msgstr "PangalanNgProg"
 
-#: src/pkg_columnizer.cc:109
+#: src/pkg_columnizer.cc:103
 msgid "ProgVer"
 msgstr "ProgVer"
 
-#: src/pkg_columnizer.cc:110
+#: src/pkg_columnizer.cc:104
 msgid "#Broken"
 msgstr "#Basag"
 
-#: src/pkg_columnizer.cc:111
+#: src/pkg_columnizer.cc:105
 msgid "DiskUsage"
 msgstr "DiskUsage"
 
-#: src/pkg_columnizer.cc:112
+#: src/pkg_columnizer.cc:106
 msgid "DownloadSize"
 msgstr "DownloadSize"
 
-#: src/pkg_columnizer.cc:132 src/pkg_columnizer.cc:144 src/pkg_ver_item.cc:103
+#: src/pkg_columnizer.cc:126 src/pkg_columnizer.cc:138 src/pkg_ver_item.cc:103
 #: src/pkg_ver_item.cc:168
 msgid "<N/A>"
 msgstr "<N/A>"
 
-#: src/pkg_columnizer.cc:174 src/pkg_columnizer.cc:185
+#: src/pkg_columnizer.cc:168 src/pkg_columnizer.cc:179
 msgid "<none>"
 msgstr "<wala>"
 
-#: src/pkg_columnizer.cc:225 src/pkg_grouppolicy.cc:222
+#: src/pkg_columnizer.cc:219 src/pkg_grouppolicy.cc:222
 msgid "virtual"
 msgstr "birtual"
 
-#: src/pkg_columnizer.cc:232 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
+#: src/pkg_columnizer.cc:226 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
 msgid "purged"
 msgstr "purged"
 
-#: src/pkg_columnizer.cc:239 src/pkg_ver_item.cc:227
+#: src/pkg_columnizer.cc:233 src/pkg_ver_item.cc:227
 msgid "half-config"
 msgstr "kalahating-config"
 
-#: src/pkg_columnizer.cc:241 src/pkg_ver_item.cc:229
+#: src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:229
 msgid "half-install"
 msgstr "kalahating-install"
 
-#: src/pkg_columnizer.cc:243 src/pkg_ver_item.cc:231
+#: src/pkg_columnizer.cc:237 src/pkg_ver_item.cc:231
 msgid "config-files"
 msgstr "config-files"
 
-#: src/pkg_columnizer.cc:247 src/pkg_columnizer.cc:533 src/pkg_ver_item.cc:235
+#: src/pkg_columnizer.cc:241 src/pkg_columnizer.cc:525 src/pkg_ver_item.cc:235
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/pkg_columnizer.cc:294 src/pkg_ver_item.cc:293
+#: src/pkg_columnizer.cc:288 src/pkg_ver_item.cc:293
 msgid "hold"
 msgstr "pigilin"
 
-#: src/pkg_columnizer.cc:299
+#: src/pkg_columnizer.cc:293
 msgid "purge"
 msgstr "purge"
 
-#: src/pkg_columnizer.cc:299 src/pkg_ver_item.cc:317
+#: src/pkg_columnizer.cc:293 src/pkg_ver_item.cc:317
 msgid "delete"
 msgstr "burahin"
 
-#: src/pkg_columnizer.cc:301 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
+#: src/pkg_columnizer.cc:295 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
 msgid "broken"
 msgstr "basag"
 
-#: src/pkg_columnizer.cc:303 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
+#: src/pkg_columnizer.cc:297 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
 #: src/pkg_ver_item.cc:319
 msgid "install"
 msgstr "Instal"
 
-#: src/pkg_columnizer.cc:305
+#: src/pkg_columnizer.cc:299
 msgid "reinstall"
 msgstr "reinstall"
 
-#: src/pkg_columnizer.cc:307
+#: src/pkg_columnizer.cc:301
 msgid "upgrade"
 msgstr "upgrade"
 
-#: src/pkg_columnizer.cc:309 src/pkg_columnizer.cc:311 src/pkg_ver_item.cc:305
+#: src/pkg_columnizer.cc:303 src/pkg_columnizer.cc:305 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 "wala"
 
-#: src/pkg_columnizer.cc:339 src/pkg_columnizer.cc:360
-#: src/pkg_columnizer.cc:367 src/pkg_grouppolicy.cc:216
-#: src/pkg_info_screen.cc:115 src/pkg_info_screen.cc:116
+#: src/pkg_columnizer.cc:333 src/pkg_columnizer.cc:354
+#: src/pkg_columnizer.cc:361 src/pkg_grouppolicy.cc:216
+#: 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 "Hindi kilala"
 
-#: src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:353
+#: src/pkg_columnizer.cc:341 src/pkg_ver_item.cc:353
 msgid "Imp"
 msgstr "Imp"
 
-#: src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:355
+#: src/pkg_columnizer.cc:343 src/pkg_ver_item.cc:355
 msgid "Req"
 msgstr "Req"
 
-#: src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:357
+#: src/pkg_columnizer.cc:345 src/pkg_ver_item.cc:357
 msgid "Std"
 msgstr "Std"
 
-#: src/pkg_columnizer.cc:353 src/pkg_ver_item.cc:359
+#: src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:359
 msgid "Opt"
 msgstr "Opt"
 
-#: src/pkg_columnizer.cc:355 src/pkg_ver_item.cc:361
+#: src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:361
 msgid "Xtr"
 msgstr "Xtr"
 
-#: src/pkg_columnizer.cc:357 src/pkg_ver_item.cc:363
+#: src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:363
 msgid "ERR"
 msgstr "ERR"
 
-#: src/pkg_columnizer.cc:379
+#: src/pkg_columnizer.cc:373
 #, c-format
 msgid "#Broken: %ld"
 msgstr "#basag: %ld"
 
-#: src/pkg_columnizer.cc:394
+#: src/pkg_columnizer.cc:388
 #, c-format
 msgid "Will use %sB of disk space"
 msgstr "Will use %sB of disk space"
 
-#: src/pkg_columnizer.cc:402
+#: src/pkg_columnizer.cc:396
 #, c-format
 msgid "Will free %sB of disk space"
 msgstr "Maka libre ng %sB ang disk space"
 
-#: src/pkg_columnizer.cc:416
+#: src/pkg_columnizer.cc:410
 #, c-format
 msgid "DL Size: %sB"
 msgstr "DL Sukat: %sB"
 
-#: src/pkg_columnizer.cc:486
+#: src/pkg_columnizer.cc:480
 msgid "HN too long"
 msgstr "HN sobrang tagal"
 
-#: src/pkg_columnizer.cc:664
+#: src/pkg_columnizer.cc:654
 msgid "Internal error: Default column string is unparsable"
 msgstr "Internal error: Default na hanay ng string ay unparsable"
 
@@ -2429,13 +2680,14 @@
 "installation."
 
 #: src/pkg_grouppolicy.cc:158
+#, fuzzy
 msgid ""
 "Programs for faxmodems and other communications devices\n"
 " Packages in the 'comm' section are used to control modems and other "
 "hardware communications devices. This includes software to control faxmodems "
 "(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
 msgstr ""
 "Programa para sa faxmodems at iba pang mga kumunikasyong kagamitan\n"
 " Pakete sa seksyon ng 'comm' mga mamit para ma-control ang modems at iba "
@@ -2896,14 +3148,15 @@
 "makikita sa seksyon na ito, anopat kung magkagayon, ay nasa 'main'."
 
 #: src/pkg_grouppolicy.cc:193
+#, fuzzy
 msgid ""
 "Programs which are not free software\n"
 " Packages in the 'non-free' section are not part of Debian.\n"
 " .\n"
 " These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
 " .\n"
 " For more information about what Debian considers to be Free Software, see "
 "http://www.debian.org/social_contract#guidelines"
@@ -2968,11 +3221,12 @@
 " Bagong salin ng paketeng ito ay available."
 
 #: src/pkg_grouppolicy.cc:320
+#, fuzzy
 msgid ""
 "New Packages\n"
 " These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
 msgstr ""
 "Bagong Pakete\n"
 " Ang mga pakete ay naidagdag sa Debian nang huling linisni mo ang listahan "
@@ -3201,144 +3455,164 @@
 " Gawain ay mga grupo ng pakete na nag bibigay ng madaling paraan para maka "
 "pili ng predefined na kumpol ng pakete para sa tanging layunin."
 
-#: src/pkg_info_screen.cc:118
+#: src/pkg_info_screen.cc:116
 msgid "Compressed size: "
 msgstr "Compressed na sukat: "
 
-#: src/pkg_info_screen.cc:119
+#: src/pkg_info_screen.cc:117
 msgid "Uncompressed size: "
 msgstr "Uncompressed na sukat: "
 
-#: src/pkg_info_screen.cc:120
+#: src/pkg_info_screen.cc:118
 msgid "Source Package: "
 msgstr "Pinanggalingan ng pakete: "
 
-#: src/pkg_info_screen.cc:130
+#: src/pkg_info_screen.cc:128
 #, c-format
 msgid "Package names provided by %s"
 msgstr "Pangalan ng pakete na binibigay ng %s"
 
-#: src/pkg_info_screen.cc:140
+#: src/pkg_info_screen.cc:138
 #, c-format
 msgid "Packages which depend on %s"
 msgstr "Pakete na naka-depende sa %s"
 
-#: src/pkg_info_screen.cc:145
+#: src/pkg_info_screen.cc:143
 msgid "Versions"
 msgstr "Bersyon"
 
-#: src/pkg_item.cc:53
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Oo, alam ko na ito'y hindi magandang ideya"
 
-#: src/pkg_item.cc:79
-#, c-format
+#: src/pkg_item.cc:80
+#, fuzzy, c-format
 msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
 msgstr ""
 "%s ay pangunahing pakete!\n"
 "\n"
 "Ikaw ba'y sigurado na aalisin ito?\n"
 "Makinilyahin '%s' kung ukaw ay sigurado."
 
-#: src/pkg_item.cc:218
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "Impormasyon tungkol sa %s"
 
-#: src/pkg_item.cc:303
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
 msgstr "Available na salin ng "
 
-#: src/pkg_item.cc:311 src/pkg_ver_item.cc:650
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Bersyon"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependensiya ng %s"
 
-#: src/pkg_item.cc:321 src/pkg_ver_item.cc:659
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
 #, c-format
 msgid "Packages depending on %s"
 msgstr "Pakete na umaasa sa %s"
 
-#: src/pkg_item.cc:372 src/pkg_ver_item.cc:696
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "Mag-ulat ng bug sa %s:\n"
 
-#: src/pkg_item.cc:394
+#: src/pkg_item.cc:414
+#, fuzzy
 msgid ""
-"You are not root and I cannot find any way\n"
-"to become root.  To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
+"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 ""
 "Ikaw ay hindi root at hindi ko makita\n"
 "para maging root.  Para reconfigure ang pakete na ito,\n"
 "instal ang menu pakete, ang login na pakete,\n"
 "o patakbuhin ang aptitude bilang root."
 
-#: src/pkg_item.cc:402
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Reconfiguring %s\n"
 
-#: src/pkg_item.cc:427
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Hierarchy editor"
 
-#: src/pkg_tree.cc:326
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hierarchy editor"
+
+#: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Hanapin ang: "
 
-#: src/pkg_tree.cc:586
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Lahat ng pakete"
 
-#: src/pkg_tree.cc:599 src/pkg_tree.cc:608
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Gumagawa ng view"
 
-#: src/pkg_tree.cc:650
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "Walang mga pakete na nagtulad sa pattern \"%s\"."
 
-#: src/pkg_tree.cc:672
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "Ilagay ang bagong limitadong puno ng pakete: "
 
-#: src/pkg_tree.cc:706
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr "ilagay ang bagong pakete grouping mechanism para sa display na ito: "
 
-#: src/pkg_tree.cc:714
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 "Ipasok ang bagong pakete na pag-uri-uriin na mekanismo para sa display: "
 
-#: src/pkg_ver_item.cc:625
-msgid "Information about "
-msgstr "Impormasyon tungkol"
-
-#: src/pkg_view.cc:342
+#: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: error sa argumento -- dalawang main widgets??"
 
-#: src/pkg_view.cc:348
+#: src/pkg_view.cc:350
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 "make_package_view: error sa argumento -- masama na hanay na listahan para sa "
 "static na gamit"
 
-#: src/pkg_view.cc:441
+#: src/pkg_view.cc:443
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: masamang argumento!"
 
-#: src/pkg_view.cc:482
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: walang main widget na-nakita"
 
@@ -3558,11 +3832,79 @@
 "Ang mga sumusunod na pakete ay naka-depende sa bersyon %B%s%b ng %B%s%b, at "
 "mababasag kapag na %s."
 
-#: src/trust.cc:21 src/trust.cc:23
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "May mga pakete na basag.  Subukin na ayusin sila?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: 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)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Provides"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Susunod"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Isara"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Ang mga sumusunod na pakete ay SIRA:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Ang mga sumusunod na pakete ay SIRA:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Ang mga sumusunod na pakete ay SIRA:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Kinukuha ang mga pakete"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
+#: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr "BABALA"
 
-#: src/trust.cc:22
+#: 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 "
@@ -3572,55 +3914,59 @@
 "ng paketeng ito ay maaaring payagan ang malisyosong tao na sirain o "
 "kontrolahin ang inyong sistema."
 
-#: src/ui.cc:145
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Erks, walang anomang error, ito'y hindi dapat na manyari.."
 
-#: src/ui.cc:200
+#: src/ui.cc:171
+msgid "E:"
+msgstr ""
+
+#: src/ui.cc:173
+msgid "W:"
+msgstr ""
+
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Maghanap ng:"
 
-#: src/ui.cc:255
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Ikaw ay nasa katayuang root"
 
-#: src/ui.cc:353
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Subprocess lumabas ng may error -- na type mo ba ang password ng tama?"
 
-#: src/ui.cc:381
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Kinakarga ang cache"
 
-#: src/ui.cc:403
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Sigurado ka sa pag alis sa Aptitude?"
 
-#: src/ui.cc:482
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Sigurado kang hayaan ang iyong personal settings at reload ang defaults?"
 
-#: src/ui.cc:582
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Mga Pakete"
 
-#: src/ui.cc:583 src/ui.cc:610
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Tingnan ang available na pakete at pumili ng aksyon para magsagawa"
 
-#: src/ui.cc:651
-#, c-format
+#: src/ui.cc:667
+#, fuzzy
 msgid ""
-"Aptitude %s\n"
-"\n"
-"Copyright 2000 Daniel Burrows.\n"
-"\n"
-"aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
-"the\n"
-"Help menu.  This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; see 'license' for details."
+"%AAptitude %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"
 "\n"
@@ -3632,85 +3978,96 @@
 "sa ilalim ng mga tiyak na kalagayan; tingnan ang 'lisensya' para sa mga "
 "detalye."
 
-#: src/ui.cc:672
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "tulong.txt"
 
-#: src/ui.cc:688
+#: src/ui.cc:704
 msgid "README"
 msgstr "BASAHINAKO"
 
-#: src/ui.cc:893
+#: src/ui.cc:786
+#, fuzzy
 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"
+"%C%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 ""
 "%BBABALA%b: may iluluklok na di katiwalang bersyon ng sumusunod na mga "
 "pakete!%n%nMga di katiwalang mga pakete ay maaaring %Bmag-kompromiso ng "
 "seguridad ng inyong sistema%b. Dapat lamang na ipagpatuloy ang pagluklok "
 "kung tiyak kayong gawin ito.%n%n"
 
-#: src/ui.cc:905
+#: src/ui.cc:800
 msgid "Really Continue"
 msgstr "Talagang magpatuloy"
 
-#: src/ui.cc:907
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr "Hintuin ang pagluklok"
 
-#: src/ui.cc:970
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Preview ng pagluklok ng mga pakete"
 
-#: src/ui.cc:971
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Tignan at/o ibagay ang aksyon na isasagawa"
 
-#: src/ui.cc:1011
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:865
+#, fuzzy
+msgid "Preview"
+msgstr "^Nakaraan"
+
+#: src/ui.cc:901
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "Ang ibang pakete ay basag at iniayos"
 
-#: src/ui.cc:1013
-msgid "Some broken packages could not be fixed!"
-msgstr "May mga basag na pakete na hindi maiayos!"
+#: src/ui.cc:907
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:1021 src/ui.cc:1141
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "May mga pakete na basag.  Subukin na ayusin sila?"
+#: src/ui.cc:913
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#: src/ui.cc:1038
+#: src/ui.cc:959
+#, fuzzy
 msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have.  Would you like to change to the root account?\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "Installing/removing ng mga pakete ay kailangan ng administrative na "
 "pribilhiyo, na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:1041 src/ui.cc:1175
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Maging root"
 
-#: src/ui.cc:1047 src/ui.cc:1177
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Huwag maging root"
 
-#: src/ui.cc:1052 src/ui.cc:1182
+#: src/ui.cc:969 src/ui.cc:1085
 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:1079
+#: src/ui.cc:996
 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:1085
+#: src/ui.cc:1002
+#, fuzzy
 msgid ""
-"No packages will be installed, removed or upgraded.\n"
-"\n"
-"Some packages could be upgraded, but you have not chosen to upgrade them.\n"
-"Type \"U\" to prepare an upgrade."
+"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 ""
 "Walang pakete ang mai-instal, ma-tatagal o ma-upgrade.\n"
 "\n"
@@ -3718,167 +4075,198 @@
 "iapgreyd\n"
 "ang mga ito. Pindutin ang \"U\" upang maghanda ng pag-apgreyd."
 
-#: src/ui.cc:1172
+#: src/ui.cc:1074
+#, fuzzy
 msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have.  Would you like to change to the root account?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "Updating ng mga pakete list ay kailangan ng administrative na pribilhiyo, "
 "na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:1187 src/ui.cc:1358
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:1194 src/ui.cc:1235
+#: src/ui.cc:1097 src/ui.cc:1150
 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:1197
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "Binubura ang mga na-download na files"
 
-#: src/ui.cc:1211
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Nakuhang pakete files ay nabura na"
 
-#: src/ui.cc:1252
-msgid "Obsolete downloaded package files have been deleted"
+#: src/ui.cc:1175
+#, 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:1334
+#: src/ui.cc:1247
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1252 src/ui.cc:1283
+#, 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:1277
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Hindi ma-buksan ang %s para sulatan"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Iluklok/tanggalin ang mga pakete"
 
-#: src/ui.cc:1335
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Gawin ang lahat ng naka-binbin na instal at mga tatanggalin"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Update ang pakete list"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Suriin para sa mga bagong bersyon ng mga pakete"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^Kalimutan ang mga bagong pakete"
 
-#: src/ui.cc:1342
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Kalimutan kung ano amg mga pakete na \"bago\""
 
-#: src/ui.cc:1345
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^Linisin ang mga cache ng pakete"
 
-#: src/ui.cc:1346
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Burahin ang pakete files na na-download ng nakaraan"
 
-#: src/ui.cc:1349
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Linisin ang  ^obsolete files"
 
-#: src/ui.cc:1350
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Alisin ang pakete files na hindi na ma-download"
 
-#: src/ui.cc:1353
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "Markahan ng ^Upgradable"
 
-#: src/ui.cc:1354
+#: src/ui.cc:1373
 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:1357
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^Maglaro ng Minesweeper"
 
-#: src/ui.cc:1360
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Maging root"
 
-#: src/ui.cc:1361
+#: src/ui.cc:1380
+#, fuzzy
 msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
 msgstr ""
 "Tumakbong 'su' para maging root; amg program ay mag re-restart, pero ang "
 "iyong\n"
 "settings ay hindi magagalaw"
 
-#: src/ui.cc:1364
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Reload ang pakete cache"
 
-#: src/ui.cc:1365
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Reload ang pakete cache"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^Umalis"
 
-#: src/ui.cc:1372
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Lumabas sa programa"
 
-#: src/ui.cc:1378 src/ui.cc:1642
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Ibalik"
 
-#: src/ui.cc:1379
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "Ulitin ang huling pakete operation o grupo ng operations"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Instal"
 
-#: src/ui.cc:1387
+#: src/ui.cc:1406
 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:1390
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Tanggalin"
 
-#: src/ui.cc:1391
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "Bandilaan ang kasalukuyan ay napiling pakete para sa pagalis"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Purge"
 
-#: src/ui.cc:1395
+#: src/ui.cc:1414
 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:1398
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Itago"
 
-#: src/ui.cc:1399
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "Kansel ang anumang aksyon sa napiling pakete"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Pigilin"
 
-#: src/ui.cc:1403
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -3886,252 +4274,256 @@
 "Kansel ang anumang aksyon sa napiling pakete, at protektahan sa balang araw "
 "na upgrades"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "Markahang ^Auto"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1426
+#, fuzzy
 msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
 msgstr ""
 "Markahan ang napiling pakete bilang otomatikong na instal;\n"
 "itoy otomatikong ma-tatanggal pag walang anomang paketeng naka-depende dito"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Markahang ^Manual"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1430
+#, fuzzy
 msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
 msgstr ""
 "Markahan ang napiling pakete bilang manually na na-instal;\n"
 "itoy hindi ma-tatanggal ngunit kung itoy iyong manually na tatanggalin"
 
-#: src/ui.cc:1414
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Forbid Na Salin"
 
-#: src/ui.cc:1415
+#: src/ui.cc:1434
+#, fuzzy
 msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
 msgstr ""
 "Ipagbawal ang kandidato na salin ng piniling pakete na ma-installed;\n"
 "bagong salin ng pakete ay ma-installed syempre"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "I^mpormasyon"
 
-#: src/ui.cc:1420
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Pakita ang higit na impormasyon tungkol sa piniling pakete"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1424
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "Ipakita ang Debian changelog ng napiling pakete"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Hanap"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Humanap ng pakete"
 
-#: src/ui.cc:1434
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "Humanap ^Ulit"
 
-#: src/ui.cc:1435
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Ulitin ang huling pag-hahanap"
 
-#: src/ui.cc:1438
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Limitahan ang pag-papakita"
 
-#: src/ui.cc:1439
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Apply ang filter sa listahan ng mga pakete"
 
-#: src/ui.cc:1441
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Un-Limit Display"
 
-#: src/ui.cc:1442
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Alisin ang filter sa mga listahan ng pakete"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "Hanapin ang ^Basag"
 
-#: src/ui.cc:1446
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^UI options"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "Baguhin ang settings na maapektuhan ang user interface"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Dependency na pag-tagan"
 
-#: src/ui.cc:1457
+#: src/ui.cc:1481
 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:1460
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Miscellaneous"
 
-#: src/ui.cc:1461
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Palitan ang samut-samot na programa settings"
 
-#: src/ui.cc:1466
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Mabalik ang options"
 
-#: src/ui.cc:1467
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "Ibalik ang lahat ng settings sa system default"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Susunod"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Pakita ang susunod na display"
 
-#: src/ui.cc:1482
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^Nakaraan"
 
-#: src/ui.cc:1483
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Pakita ang nakaraang display"
 
-#: src/ui.cc:1486
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Isara"
 
-#: src/ui.cc:1487
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Isara ang display"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "^Tanaw ng Bagong mga Pakete"
 
-#: src/ui.cc:1493
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Gumawa ng bagong default pakete view"
 
-#: src/ui.cc:1496
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Bagong Kategoryang ^Browser"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Silipin ang pakete ayon sa kategorya"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Tungkol"
 
-#: src/ui.cc:1507
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Basahin ang impormasyon tungkol sa programang ito"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Tulong"
 
-#: src/ui.cc:1511
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Basahin ang tulong na on-line"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Manwal ng Pag-gamit"
 
-#: src/ui.cc:1514
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "Basahin ang detalyadong manwal ng programa"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Basahin ang talaan ng madalas na tanungin"
 
-#: src/ui.cc:1521
-msgid "^ChangeLog"
-msgstr "Talaan ng ^Pagbabago"
+#: src/ui.cc:1545
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1522
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1546
+#, 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:1525
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Lisensiya"
 
-#: src/ui.cc:1526
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "Basahin ang mga tadhana kung paano makokopya ang programa"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Mga Gagawin"
 
-#: src/ui.cc:1644
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Paghahanap"
 
-#: src/ui.cc:1645
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "Mga Pagpipilian"
 
-#: src/ui.cc:1646
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Mga Pananaw"
 
-#: src/ui.cc:1647
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Tulong"
 
-#: src/ui.cc:1692
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: Menu  %s: Tulong %s: Quit %s: Apdeyt  %s: Kumuha/Instol/Tanggal ng Pkt"
 
-#: src/ui.cc:1954 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "o"
 
-#: src/ui.cc:1955 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "h"
 
@@ -4143,6 +4535,16 @@
 msgid "Downloading Changelog"
 msgstr "Kinukuha ang Changelog"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Kinukuha ang Changelog"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
@@ -4162,3 +4564,88 @@
 #, c-format
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Aray!  Nakatanggap ng SIGQUIT, namamatay..\n"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Utusan:\n"
+#~ "  y: magpatuloy sa installation\n"
+#~ "  n: agas and lisanin\n"
+#~ "  i: ipakita ang impormasyon tungkol sa isa o lahat na pakete;\n"
+#~ "     ang pangalan ng pakete ay kailangan sundan ng 'i'\n"
+#~ "  c: ipakita ang Debian changelogs ng isa o lahat ng pakete;\n"
+#~ "     ang pangalan ng pakete ay kailangan sundan ng 'c'\n"
+#~ "  d: ipakita ang impormasyon ng dependency\n"
+#~ "  s: ipakita ang pagbabagong sukat ng mga pakete\n"
+#~ "  v: ipakita ang salin\n"
+#~ "  e: ipasok ang buong visual interface\n"
+#~ "\n"
+#~ "  Pwede mo specify ang pagbabago sa isang kumpol ng mga aktion na "
+#~ "pakete.\n"
+#~ "  Para gawin, ilagay ang aksyon karaktÃ©r kasunod ng isa o lahat na "
+#~ "pangalan ng pakete\n"
+#~ "o patterns.  Ang aksyon ay bisa sa lahat ng mga pakete. (pwede ka mag "
+#~ "specify\n"
+#~ "ng karagdagan na aksyon; bawat isa ay mag kakabisa sa lahat ng pakete na "
+#~ "kasunod nito)\n"
+#~ "\n"
+#~ "Aksyon:\n"
+#~ "  + : Install\n"
+#~ "  - : Alisin\n"
+#~ "  _ : Purge\n"
+#~ "  = : Pigilin\n"
+
+#~ msgid ""
+#~ "Some packages had unmet dependencies.  This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "May mga paketeng may kulang na dependensiya.  Maaaring kayo'y humiling\n"
+#~ "ng imposibleng sitwasyon o kung kayo ay gumagamit ng pamudmod na "
+#~ "unstable\n"
+#~ "ay may mga kailangang mga pakete na hindi pa nalilikha o linipat mula sa\n"
+#~ "Incoming.\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Paki insert ang mga sumusunod na disc sa drive \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Hindi valid na option para sa interactive mode: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Impormasyon tungkol"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "May mga basag na pakete na hindi maiayos!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "Talaan ng ^Pagbabago"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-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"
@@ -155,7 +155,7 @@
 msgstr "KullanÄ±lmayan paketleri bu filtreye uyarak otomatik olarak kaldÄ±r"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Tamam"
@@ -298,47 +298,47 @@
 "Not: \"%2$s\" sanal paketi yerine\n"
 "      \"%1$s\" seÃ§iliyor\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s paketinin istenen sÃ¼rÃ¼mÃ¼ zaten kurulu (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s ÅŸu anda kurulu deÄŸil, bu nedenle yeniden yÃ¼klenmeyecek.\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "%s paketi kurulu deÄŸil, bu nedenle kaldÄ±rÄ±lmayacak\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "%s paketi kurulu deÄŸil, bu nedenle yÃ¼kseltilmesi engellenemez\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "%s paketi yÃ¼kseltilemez, bu nedenle yÃ¼kseltilmesi engellenemez\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Not: \"%s: %s\" gÃ¶revi kurulum iÃ§in seÃ§ildi\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "'kur' komutu iÃ§in yalnÄ±zca sÃ¼rÃ¼m belirtebilirsiniz\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "'kur' komutu iÃ§in yalnÄ±zca bir paket arÅŸivi belirtebilirsiniz\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -347,7 +347,7 @@
 "\"%s\" paketi bulunamadÄ±, ve 40'tan fazla\n"
 "paket \"%s\" 'i isimlerinde iÃ§ermekte.\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -356,12 +356,12 @@
 "\"%s\" paketi bulunamadÄ±.  Bununla beraber aÅŸaÄŸÄ±daki\n"
 "paketler \"%s\" 'i isimlerinde iÃ§ermekte:\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "AdÄ±nda ya da tanÄ±mÄ±nda \"%s\" iÃ§eren hiÃ§bir paket bulunamadÄ±\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -370,7 +370,7 @@
 "\"%s\" paketi bulunamadÄ±, ve 40'tan fazla\n"
 "paket \"%s\" 'i tanÄ±mlarÄ±nda iÃ§ermekte.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -379,6 +379,11 @@
 "\"%s\" 'e uygun paket bulunamadÄ±, Bununla beraber,\n"
 "aÅŸaÄŸÄ±daki paketler \"%s\" 'i tanÄ±mlarÄ±nda iÃ§ermekte:\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "KÃ¶tÃ¼ eylem karakteri '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Sensible-pager Ã§alÄ±ÅŸtÄ±rÄ±lamÄ±yor, bu Ã§alÄ±ÅŸan bir Debian sistemi mi?"
@@ -418,7 +423,7 @@
 msgid "Invalid operation %s"
 msgstr "GeÃ§ersiz iÅŸlem %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -429,16 +434,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "Ä°ndirme: Indirmek iÃ§in en az bir paket belirtmelisiniz\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Kaynak listesi okunamÄ±yor"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "\"%s\" adÄ±nda bi paket bulunamÄ±yor"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -493,95 +498,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Bu da ne? YÄ±lan tarafÄ±ndan yenen bir fil, tabii ki.\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "Kaynak listesi okunamÄ±yor"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "fakat %s kurulacak."
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "fakat %s kurulu ve tutulacak."
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "fakat %s kurulu."
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "fakat kurulabilir deÄŸil"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " sanal bir paket."
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " ya da"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "AÅŸaÄŸÄ±daki paketler BOZUK:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "AÅŸaÄŸÄ±daki paketler kullanÄ±lmÄ±yor ve KALDIRILACAK:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "AÅŸaÄŸÄ±daki paketler otomatik olarak korunacak:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "AÅŸaÄŸÄ±daki YENÄ° paketler otomatik olarak kurulacak:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "AÅŸaÄŸÄ±daki paketler otomatik olarak KALDIRILACAK:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "AÅŸaÄŸÄ±daki paketlerin Ã–NCEKI SURUMLERI yÃ¼klenecek:  "
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "AÅŸaÄŸÄ±daki paketler otomatik olarak korundu:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "AÅŸaÄŸÄ±daki paketler otomatik olarak YENIDEN KURULDU:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "AÅŸaÄŸÄ±daki YENI paketler otomatik olarak kurulacak:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "AÅŸaÄŸÄ±daki paketler KALDIRILACAK:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "AÅŸaÄŸÄ±daki paketler yÃ¼kseltilecek:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "AÅŸaÄŸÄ±daki TEMEL paketler KALDIRILACAK!\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Bu iÅŸlem aÅŸaÄŸÄ±daki TEMEL paketleri BOZACAK:\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -590,103 +595,231 @@
 "UYARI: Bu iÅŸlemi gerÃ§ekleÅŸtirmek sisteminize zarar verebilir!\n"
 "       TAM OLARAK ne yaptÄ±ÄŸÄ±nÄ±zdan emin olmadan DEVAM ETMEYIN!\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "Bunun kÃ¶tÃ¼ bir fikir olduÄŸunun farkÄ±ndayÄ±m"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Devam etmek iÃ§in, \"%s\" ifadesini girin :\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "Evet"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "HayÄ±r"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "Devam etmek iÃ§in, \"%s\" ifadesini girin :\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "AÅŸaÄŸÄ±daki paketlerin kurulmasÄ± Ã–NERÄ°LDÄ°, fakat KURULMAYACAK:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "AÅŸaÄŸÄ±daki paketlerin kurulmasÄ± TEKLÄ°F EDÄ°LDÄ°, fakat kurulmayacak:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "HiÃ§bir paket kurulmayacak, yÃ¼kseltilmeyecek ya da kaldÄ±rÄ±lmayacak.\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paket yÃ¼kseltildi, %lu yeni kuruldu, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu yeniden kuruldu, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu eski sÃ¼rÃ¼mÃ¼ yÃ¼klendi,"
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu kaldÄ±rÄ±ldÄ±, %lu yÃ¼kseltilmedi.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "ArÅŸivden %sB/%sB alÄ±nacak."
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "ArÅŸivlerden %sB veri alÄ±nacak."
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Paketler aÃ§Ä±ldÄ±ktan sonra %sB yer kullanÄ±lacak.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Paketler aÃ§Ä±ldÄ±ktan sonra %sB serbest kalacak.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "KÃ¶tÃ¼ eylem karakteri '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "GÃ¶sterilecek paket yok -- 'i'ye bastÄ±ktan sonra Ã§Ä±kan satÄ±ra paket "
 "isimlerini girin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "Devam etmek iÃ§in Enter tuÅŸuna basÄ±n."
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Paket bulunamadÄ± -- 'c'ye bastÄ±ktan sonra Ã§Ä±kan satÄ±ra paket isimlerini "
 "girin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "Devam etmek iÃ§in Enter tuÅŸuna basÄ±n."
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "Paket gÃ¶rÃ¼ntÃ¼leme iÃ§in varsayÄ±lan gÃ¶sterim biÃ§imi"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^Paketleri kur/kaldÄ±r"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "AÅŸaÄŸÄ±daki YENÄ° paketler otomatik olarak kurulacak:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^Paketleri kur/kaldÄ±r"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "Yeni paketleri ^unut"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Paketleri tut\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr ""
+"markauto     - Paketler otomatik olarak kurulacak ÅŸekilde iÅŸaretlenir\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto     - Paketler elle kurulacak ÅŸekilde iÅŸaretlenir\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "tavsiye ederse"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Devam etmek istiyor musunuz? [Y/n/?]"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -697,7 +830,7 @@
 "BaÄŸÄ±mlÄ±lÄ±k bilgisi gÃ¶sterilecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -708,7 +841,7 @@
 "BaÄŸÄ±mlÄ±lÄ±k bilgisi gÃ¶sterilmeyecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -719,7 +852,7 @@
 "SÃ¼rÃ¼mler gÃ¶sterilecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -730,7 +863,7 @@
 "SÃ¼rÃ¼mler gÃ¶sterilmeyecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -741,7 +874,7 @@
 "Boyut deÄŸiÅŸiklikleri gÃ¶sterilecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -752,129 +885,102 @@
 "Boyut deÄŸiÅŸiklikleri gÃ¶sterilmeyecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Komutlar:\n"
-"  y: Kuruluma devam et\n"
-"  n: iptal et ve Ã§Ä±k\n"
-"  i: paketler hakkÄ±nda bilgi gÃ¶ster;\n"
-"     'i'den sonra paket ismi girilmeli\n"
-"  c: bir ya da daha Ã§ok paket iÃ§in Debian deÄŸiÅŸiklik\n"
-"     gÃ¼ncesini gÃ¶ster; 'c'den sonra paket isimleri girilmeli\n"
-"  d: baÄŸÄ±mlÄ±lÄ±k bilgisini gÃ¶sterme/gÃ¶stermeme\n"
-"  s: paket bÃ¼yÃ¼klÃ¼ÄŸÃ¼ndeki deÄŸiÅŸiklikleri gÃ¶ster/gÃ¶sterme\n"
-"  v: versiyonlarÄ± gÃ¶ster/gÃ¶sterme\n"
-"  e: tam gÃ¶rsel ekrana geÃ§\n"
-"\n"
-"  Paket eylemleri kÃ¼mesi iÃ§in deÄŸiÅŸiklikleri de belirtebilirsiniz.\n"
-"  ÅŸÃ¶yle ki, bir eylem karakteri yazÄ±n ardÄ±ndandan bir ya da birden fazla "
-"paket adÄ±\n"
-"ya da desen girin. (Ek eylemler belirtebilirsini; her biri takip eden her "
-"pakete\n"
-"uygulanÄ±r)\n"
-"\n"
-"Eylemler:\n"
-"  + : Kur\n"
-"  - : KaldÄ±r\n"
-"  _ : Temizle\n"
-"  = : Tut\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "YanlÄ±ÅŸ cevap.  LÃ¼tfen geÃ§erli bir komut girin ya da yardÄ±m iÃ§in '?'.\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "Programdan Ã§Ä±kar"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, 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:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "AÅŸaÄŸÄ±daki paketler BOZUK:"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Durum dosyasÄ± yazma hatasÄ±"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, 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:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, 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:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, 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"
@@ -1170,7 +1276,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:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "EskimiÅŸ indirilmiÅŸ dosyalar siliniyor"
 
@@ -1455,23 +1561,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "BaÄŸÄ±mlÄ±lÄ±klar saÄŸlanamÄ±yor, bazÄ± paketler kurulamÄ±yor"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "Kaynak listesi okunamÄ±yor"
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Paket listesi ya da durum dosyasÄ± anlaÅŸÄ±lamadÄ± ya da aÃ§Ä±lamadÄ±"
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "Bu kayÄ±p dosyalar iÃ§in paket listesini gÃ¼ncellemek istemelisiniz"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "%s yazmak iÃ§in aÃ§Ä±lamÄ±yor"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1739,17 +1840,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "GeÃ§ersiz sÄ±ralama kural tipi '%s'"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s derlendi %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Derleyici: g++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1758,7 +1859,7 @@
 "\n"
 "NCurses versiyon: %s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1767,22 +1868,22 @@
 "\n"
 "Curses versiyon: %s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ versiyon: %s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "KullanÄ±m: aptitude [-S dosyaadÄ± [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [seÃ§enekler] <eylem> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1791,43 +1892,43 @@
 "  Eylemler (EÄŸer seÃ§ilmemiÅŸse, aptitude etkileÅŸimli moda girer):\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr "install      - Paketleri kur/gÃ¼ncelle\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Paketleri kaldÄ±r\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Paketleri ve onlara ait ayar dosyalarÄ±nÄ± kaldÄ±r\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Paketleri tut\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold         - Bir paket iÃ§in hold(tut) komutunu iptal et\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 "markauto     - Paketler otomatik olarak kurulacak ÅŸekilde iÅŸaretlenir\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto     - Paketler elle kurulacak ÅŸekilde iÅŸaretlenir\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1836,17 +1937,17 @@
 " forbid-version - Aptitude'un belirli bir paket sÃ¼rÃ¼mÃ¼ne yÃ¼kseltmesini "
 "engelle.\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update     - Yeni/gÃ¼ncellenebilir paketlerin listesini indir\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade     - GÃ¼venli bir gÃ¼ncelleme uygula\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1855,69 +1956,69 @@
 " dist-upgrade    GÃ¼ncelleme uygula, mÃ¼mkÃ¼n olduÄŸunca paketleri kurma ve "
 "kaldÄ±rma\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr "forget-new       Hangi paketlerin \"yeni\" olduÄŸunu unut\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - Paketleri ismine ve/veya tanÄ±mlara gÃ¶re ara\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Bir paket hakkÄ±nda detaylÄ± bilgi gÃ¶ster\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean         - Ä°ndirilmiÅŸ paket dosyalarÄ±nÄ± sil\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Eski indirilmiÅŸ paket dosyalarÄ±nÄ± sil\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Paketin deÄŸiÅŸiklik gÃ¼ncesini gÃ¶ster\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download    - Bir paket iÃ§in.deb dosyasÄ±nÄ± indir\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  SeÃ§enekler:\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Bu yardÄ±m metni\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Eylemi simule et, fakat iÅŸlemi gerÃ§ekleÅŸtirme.\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Sadece paketleri indir, hiÃ§ bir ÅŸey kurma ya da kaldÄ±rma\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -p             Her zaman onay iÃ§in ya da eylem iÃ§in sor\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1925,7 +2026,7 @@
 " -y             Sadece evet/hayÄ±r ÅŸeklindeki sorulara onaya gerek kalmadan "
 "'evet' de\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1934,7 +2035,7 @@
 " -F format      Arama sonuÃ§larÄ±nÄ± gÃ¶stermek iÃ§in bir format belirle; "
 "kÄ±lavuza bakÄ±nÄ±z\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1942,55 +2043,55 @@
 " -O dÃ¼zen       Arama sonuÃ§larÄ±nÄ±n nasÄ±l sÄ±ralanacaÄŸÄ±nÄ± belirt; kÄ±lavuza "
 "bakÄ±nÄ±z\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w geniÅŸlik       Arama sonuÃ§larÄ± iÃ§in gÃ¶sterme geniÅŸliÄŸi belirt\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             KÄ±rÄ±k paketleri zorla dÃ¼zeltmeye Ã§alÄ±ÅŸ.\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Paketlerin hangi versiyonlarÄ±nÄ±n kurulacaÄŸÄ±nÄ± gÃ¶ster.\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Otomatik olarak deÄŸiÅŸecek baÄŸÄ±mlÄ±lÄ±k dosyalarÄ±nÄ± gÃ¶ster.\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 " -Z\t\t     Her bir paketin kurulduktan sonraki bÃ¼yÃ¼klÃ¼k deÄŸiÅŸikliÄŸini "
 "gÃ¶ster.\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v             Ekstra bilgi gÃ¶ster. (birden fazla desteklenebilir)\n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [sÃ¼rÃ¼m]   Paketlerin kurulacaÄŸÄ± sÃ¼rÃ¼mÃ¼ ayarla\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o key=deÄŸ     'key' yapÄ±landÄ±rma seÃ§eneÄŸini doÄŸrudan deÄŸiÅŸtir\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -2000,62 +2101,62 @@
 "olarak\n"
 "                var sayÄ±lÄ±p sayÄ±lmayacaÄŸÄ±nÄ± belirler.\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S dosyaadi: aptitude geliÅŸmiÅŸ durum bilgisini dosyaadi'ndan oku.\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : BaÅŸlangÄ±Ã§ta yeni paket listelerini indir.\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Bir kurulum yap ve baÅŸlangÄ±Ã§ta Ã§alÄ±ÅŸtÄ±r.\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Bu yetenek SÃ¼per Ä°nek GÃ¼Ã§lerine sahip deÄŸil.\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o key=deÄŸer ÅŸeklinde bir seÃ§enek gerekiyor, %s elde edildi"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "TUHAFLIK: bilinmeyen seÃ§enek kodu alÄ±ndÄ±\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "YalnÄ±zca -u ve -i den biri belirtilmeli\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "-u ve -i komut satÄ±rÄ± modunda belirtilemez ('install' ile, gibi)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "-u ve -i bir komutla birlikte kullanÄ±lamaz"
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Bilinmeyen komut \"%s\"\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2086,7 +2187,7 @@
 msgid "Lost"
 msgstr "Kaybettin"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "MayÄ±n tarlasÄ±"
 
@@ -2260,7 +2361,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "Paket"
 
@@ -3731,52 +3832,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Herhangi bir hata yok, bu gerÃ§ekleÅŸmemeliydi..."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "Ara: "
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Zaten root yetkiniz var!"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "AltsÃ¼reÃ§ bir hata ile sonlandÄ± -- parolanÄ±zÄ± doÄŸru girdiniz mi?"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Ã–nbellek yÃ¼kleniyor"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Aptitude'dan Ã§Ä±kÄ±lsÄ±n mÄ±?"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "KiÅŸisel tercihleriniz unutulup Ã¶ntanÄ±mlÄ± ayarlar yÃ¼klensin mi?"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "Paketler"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "KullanÄ±labilir paketleri gÃ¶sterir ve bir eylem seÃ§menizi saÄŸlar"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3792,15 +3893,15 @@
 "menÃ¼sÃ¼ndeki 'Lisans' seÃ§eneÄŸine bakabilirsiniz.  Bu bir Ã–zgÃ¼r YazÄ±lÄ±m'dÄ±r, "
 "ve belirli koÅŸullar altÄ±nda daÄŸÄ±tÄ±labilir."
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "yardÄ±m.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "BENÄ°OKU"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3808,45 +3909,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "Devam"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Paket kurulumu Ã¶nizlemesi"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 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:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "Ã–n^ceki"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, 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:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3855,23 +3956,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:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Root ol"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Root olma"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 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:995
+#: src/ui.cc:996
 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:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3883,7 +3984,7 @@
 "BazÄ± paketler yÃ¼kseltilebilir, ama onlarÄ± yÃ¼kseltmeyi seÃ§mediniz.\n"
 "YÃ¼kseltme iÃ§in \"U\" tuÅŸuna basÄ±n."
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3892,101 +3993,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:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 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:1097 src/ui.cc:1150
 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:1100
 msgid "Deleting downloaded files"
 msgstr "Ä°ndirilmiÅŸ dosyalar siliniyor"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Ä°ndirilmiÅŸ paketler silindi."
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, 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:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, 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:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "%s yazmak iÃ§in aÃ§Ä±lamÄ±yor"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^Paketleri kur/kaldÄ±r"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "Bekleyen tÃ¼m kurulum ve kaldÄ±rma iÅŸlemlerini gerÃ§ekleÅŸtirir"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "Paket listesini ^gÃ¼ncelle"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Paketleri yeni sÃ¼rÃ¼mleri iÃ§in denetler"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "Yeni paketleri ^unut"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "Yeni paketleri unutur"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "Paket Ã¶n^belleÄŸini temizle"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "Daha Ã¶nce indirilmiÅŸ paket dosyalarÄ±nÄ± siler"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "Eski d^osyalarÄ± temizle"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "ArtÄ±k indirilemeyecek olan (eski) paket dosyalarÄ±nÄ± siler"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "^GÃ¼ncellenebilir iÅŸaretle"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 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:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "MayÄ±n tarlasÄ± ^oyna"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "Root o^l"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3995,69 +4109,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:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "Paket arabelleÄŸini ^yenile"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Paket Ã¶nbelleÄŸini yeniden yÃ¼kle"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "Ã‡Ä±^k"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "Programdan Ã§Ä±kar"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Geri al"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 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:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^Kur"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 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:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^KaldÄ±r"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 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:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Temizle"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 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:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Koru"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "SeÃ§ili paket ile ilgili herhangi bir iÅŸlemi iptal et"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Tut"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -4065,11 +4179,11 @@
 "SeÃ§ili paket ile ilgili herhangi bir iÅŸlemi iptal et ve daha sonra "
 "yapÄ±lacakyÃ¼kseltmelerden koru"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "^Otom. Ä°ÅŸaretle"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -4078,11 +4192,11 @@
 "Paketi otomatik kurulmuÅŸ olarak iÅŸaretle; daha sonra bu pakete\n"
 "baÄŸÄ±mlÄ± paket kalmazsa otomatik olarak kaldÄ±r"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "Elle ^Ä°ÅŸaretle"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -4091,11 +4205,11 @@
 "Paketi el ile kurulmuÅŸ olarak iÅŸaretle; siz silmek istemediÄŸiniz\n"
 "sÃ¼rece kurulu kalacaktÄ±r"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "SÃ¼rÃ¼mÃ¼ ^Engelle"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -4104,215 +4218,215 @@
 "Åž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:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "^Bilgi"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "SeÃ§ilen paket hakkÄ±nda daha detaylÄ± bilgi gÃ¶ster"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "SeÃ§ili paketin Debian deÄŸiÅŸiklik gÃ¼ncesini gÃ¶ster"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^Bul"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "Paket ara"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "^Tekrar Bul"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "Son aramayÄ± tekrarla"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "GÃ¶rÃ¼nÃ¼mÃ¼ ^KÄ±sÄ±tla"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "Paket listesini filtrele"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "GÃ¶rÃ¼nÃ¼mÃ¼ KÄ±sÄ±tla^ma"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Paket listesine uygulanan filtreyi kaldÄ±r"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "^BozuklarÄ± Bul"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Paket baÄŸÄ±mlÄ±lÄ±ÄŸÄ± karÅŸÄ±lanamayan sonraki paketi bul"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "^ArayÃ¼z seÃ§enekleri"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "KullanÄ±cÄ± arayÃ¼zÃ¼nÃ¼ etkileyen ayarlarÄ± deÄŸiÅŸtirir"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^BaÄŸÄ±mlÄ±lÄ±k iÅŸleme"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 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:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Ã‡eÅŸitli"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "ProgramÄ±n Ã§eÅŸitli ayarlarÄ±nÄ± deÄŸiÅŸtirir"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^SeÃ§enekleri sÄ±fÄ±rla"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "TÃ¼m ayarlarÄ± sistem Ã¶ntanÄ±mlÄ± biÃ§imlerine getirir"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Sonraki"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Sonraki ekranÄ± gÃ¶rÃ¼ntÃ¼le"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "Ã–n^ceki"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Ã–nceki ekranÄ± gÃ¶rÃ¼ntÃ¼le"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^Kapat"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "Bu ekranÄ± kapat"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Yeni paket gÃ¶^rÃ¼nÃ¼mÃ¼"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Yeni bir Ã¶ntanÄ±mlÄ± paket gÃ¶rÃ¼nÃ¼mÃ¼ oluÅŸtur"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Yeni kategorik ^gezgin"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Paketlere kategoriye gÃ¶re gÃ¶zat"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^HakkÄ±nda"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Bu program hakkÄ±ndaki bilgileri gÃ¶rÃ¼ntÃ¼ler"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^YardÄ±m"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Ã‡evrimiÃ§i yardÄ±mÄ± gÃ¶rÃ¼ntÃ¼ler"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "Kulla^nÄ±cÄ± ElkitabÄ±"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "ProgramÄ±n detaylÄ± elkitabÄ±nÄ± gÃ¶rÃ¼ntÃ¼ler"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^SSS"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "SÄ±k sorulan sorularÄ±n bir listesini gÃ¶rÃ¼ntÃ¼ler"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, 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:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Lisans"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "ProgramÄ± kopyalayabileceÄŸiniz koÅŸullarÄ± gÃ¶rÃ¼ntÃ¼ler"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "Eylemler"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "Ara"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "SeÃ§enekler"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "GÃ¶rÃ¼nÃ¼mler"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "YardÄ±m"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 "%s: MenÃ¼  %s: YardÄ±m  %s: Ã‡Ä±k  %s: GÃ¼ncelle  %s: Paketleri Ä°ndir/Kur/KaldÄ±r"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "evet_anahtarÄ±"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "anahtar_yok"
 
@@ -4354,13 +4468,56 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "SIGQUIT sinyali alÄ±ndÄ±, program kapanÄ±yor..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "Evet"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "HayÄ±r"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Komutlar:\n"
+#~ "  y: Kuruluma devam et\n"
+#~ "  n: iptal et ve Ã§Ä±k\n"
+#~ "  i: paketler hakkÄ±nda bilgi gÃ¶ster;\n"
+#~ "     'i'den sonra paket ismi girilmeli\n"
+#~ "  c: bir ya da daha Ã§ok paket iÃ§in Debian deÄŸiÅŸiklik\n"
+#~ "     gÃ¼ncesini gÃ¶ster; 'c'den sonra paket isimleri girilmeli\n"
+#~ "  d: baÄŸÄ±mlÄ±lÄ±k bilgisini gÃ¶sterme/gÃ¶stermeme\n"
+#~ "  s: paket bÃ¼yÃ¼klÃ¼ÄŸÃ¼ndeki deÄŸiÅŸiklikleri gÃ¶ster/gÃ¶sterme\n"
+#~ "  v: versiyonlarÄ± gÃ¶ster/gÃ¶sterme\n"
+#~ "  e: tam gÃ¶rsel ekrana geÃ§\n"
+#~ "\n"
+#~ "  Paket eylemleri kÃ¼mesi iÃ§in deÄŸiÅŸiklikleri de belirtebilirsiniz.\n"
+#~ "  ÅŸÃ¶yle ki, bir eylem karakteri yazÄ±n ardÄ±ndandan bir ya da birden fazla "
+#~ "paket adÄ±\n"
+#~ "ya da desen girin. (Ek eylemler belirtebilirsini; her biri takip eden her "
+#~ "pakete\n"
+#~ "uygulanÄ±r)\n"
+#~ "\n"
+#~ "Eylemler:\n"
+#~ "  + : Kur\n"
+#~ "  - : KaldÄ±r\n"
+#~ "  _ : Temizle\n"
+#~ "  = : Tut\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-03-28 10:53-0500\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2005-04-27 15:54+0930\n"
 "Last-Translator: Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -15,136 +15,239 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#:src/apt_options.cc:62
+#: 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:64
+#: 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:66
+#: 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:68
+#: 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:70
+#: 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:72
+#: 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:74
+#: 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:76
+#: src/apt_options.cc:123
+#, fuzzy
+msgid "Never"
+msgstr "MÃ¡y chá»§"
+
+#: src/apt_options.cc:124
+msgid "When an error occurs"
+msgstr ""
+
+#: src/apt_options.cc:125
+msgid "Always"
+msgstr ""
+
+#: 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:78
+#: 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:80
+#: 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:82
+#: 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:84
+#: 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:86
+#: 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:88
+#: 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:91
+#: 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:94
+#: 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:103
+#: 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:105
+#: 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:107
+#: 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:110
+#: 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:113
+#: 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:116
+#: 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:119
+#: 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á»§."
+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:122
+#: 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:129
+#: 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:131
+#: 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:133
+#: 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:135
+#: 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:137
+#: 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:185 src/mine/cmine.cc:247 src/mine/cmine.cc:320
-#:src/vscreen/vs_util.cc:53 src/vscreen/vs_util.cc:215
+#: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "ÄÆ°á»£c"
 
-#:src/apt_options.cc:186 src/download_list.cc:57 src/mine/cmine.cc:249
-#:src/mine/cmine.cc:322 src/vscreen/vs_util.cc:215
+#: src/apt_options.cc:242 src/download_list.cc:71 src/mine/cmine.cc:257
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "ThÃ´i"
 
-#:src/cmdline/cmdline_action.cc:36
-#,c-format
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+#, fuzzy
+msgid "Suggest "
+msgstr "Äá»‡ nghá»‹"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "cÃ i"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "cÃ i"
+
+#: src/broken_indicator.cc:173
+#, c-format
+msgid "%d removals"
+msgstr ""
+
+#: src/broken_indicator.cc:178
+msgid "1 removal"
+msgstr ""
+
+#: src/broken_indicator.cc:182
+#, c-format
+msgid "%d keeps"
+msgstr ""
+
+#: src/broken_indicator.cc:187
+msgid "1 keep"
+msgstr ""
+
+#: src/broken_indicator.cc:191
+#, fuzzy, c-format
+msgid "%d upgrades"
+msgstr "cáºp nháºt"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "cáºp nháºt"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "bá»‹ háº¡ cáº¥p"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "bá»‹ háº¡ cáº¥p"
+
+#: src/broken_indicator.cc:214
+#, c-format
+msgid "%s: Examine"
+msgstr ""
+
+#: src/broken_indicator.cc:216
+#, c-format
+msgid "%s: Apply"
+msgstr ""
+
+#: src/broken_indicator.cc:218
+#, fuzzy, c-format
+msgid "%s: Next"
+msgstr "^Káº¿"
+
+#: src/broken_indicator.cc:220
+#, c-format
+msgid "%s: Previous"
+msgstr ""
+
+#: src/broken_indicator.cc:233
+#, c-format
+msgid "%CSolution search failed.  %s: try harder"
+msgstr ""
+
+#: src/broken_indicator.cc:239
+#, c-format
+msgid "%CUnable to resolve dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_action.cc:36
+#, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
@@ -152,16 +255,17 @@
 "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"
-msgstr "Ghi chÃº: \"%s\", náº¿u gÃ³i áº£o\n"
+msgstr ""
+"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"
@@ -169,18 +273,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"
@@ -188,48 +292,50 @@
 "Ghi chÃº: sáº½ lá»±a chá»n \"%s\" thay tháº¿\n"
 "      gÃ³i áº£o \"%s\"\n"
 
-#:src/cmdline/cmdline_action.cc:92
-#,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:98
-#,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:105 src/cmdline/cmdline_action.cc:111
-#,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:123
-#,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:125
-#,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:213
-#,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:240
-#,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"
+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:246
-#,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"
+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:280
-#,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"
@@ -237,8 +343,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:283
-#,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"
@@ -246,13 +352,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:307
-#,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:309
-#,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"
@@ -260,219 +366,249 @@
 "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:312
-#,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"
-msgstr "KhÃ´ng tÃ¬m tháº¥y gÃ³i khá»›p vá»›i \"%s\",\n"
+msgstr ""
+"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_changelog.cc:28
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "KÃ½ tá»± hÃ nh Ä‘á»™ng sai '%c'\n"
+
+#: 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?"
+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Ã³."
+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."
 
-#:src/cmdline/cmdline_clean.cc:52
-#,c-format
 # Variable: do not translate/ biáº¿n: Ä‘á»«ng dá»‹ch
+#: src/cmdline/cmdline_clean.cc:52
+#, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Del %s* %spartial/*\n"
 
-#:src/cmdline/cmdline_do_action.cc:67
-#,c-format
+#: src/cmdline/cmdline_clean.cc:80
+#, c-format
+msgid "Del %s %s [%sB]\n"
+msgstr ""
+
+#: src/cmdline/cmdline_clean.cc:136
+#, fuzzy, c-format
+msgid "Would free %sB of disk space\n"
+msgstr "Sáº½ giáº£i phÃ³ng %sB thÃªm chá»— trÃªn Ä‘Ä©a"
+
+#: src/cmdline/cmdline_clean.cc:139
+#, fuzzy, c-format
+msgid "Freed %sB of disk space\n"
+msgstr "Sáº½ giáº£i phÃ³ng %sB thÃªm chá»— trÃªn Ä‘Ä©a"
+
+#: 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:206 src/cmdline/cmdline_simulate.cc:30
-#:src/cmdline/cmdline_upgrade.cc:89
-#,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:43 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:64
-#,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:74
-#,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?"
-msgstr "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Å©."
+msgstr ""
+"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"
+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:44
+#: 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:219 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:222 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:225 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:229 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:233 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:236 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:248
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "Theo Ä‘Ã¢y cÃ³ nhá»¯ng gÃ³i bá»‹ NGáº®T:"
 
-#:src/cmdline/cmdline_prompt.cc:249
+#: 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:250
+#: 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:251
+#: 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:252
+#: 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:253
+#: 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:254
+#: 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:255
+#: 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:256
+#: 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:257
+#: 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:258
+#: 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:307
-#,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:316
-#,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:326
-#,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"
-msgstr "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"
+msgstr ""
+"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:328
+#: 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:331
-#,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:371
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
 "\n"
@@ -480,117 +616,217 @@
 "You should only proceed with the installation if you are certain that\n"
 "this is what you want to do.\n"
 "\n"
-msgstr "Cáº¢NH BÃO: sáº½ cÃ i phiÃªn báº£n khÃ´ng Ä‘Ã¡ng tin cá»§a nhá»¯ng gÃ³i theo Ä‘Ã¢y.\n"
+msgstr ""
+"Cáº¢NH BÃO: sáº½ cÃ i phiÃªn báº£n khÃ´ng Ä‘Ã¡ng tin cá»§a nhá»¯ng gÃ³i theo Ä‘Ã¢y.\n"
 "\n"
 "GÃ³i khÃ´ng tin cÃ³ thá»ƒ háº¡i tháºm báº£o máºt cá»§a há»‡ thá»‘ng báº¡n.\n"
 "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:380 src/ui.cc:859 src/vscreen/vs_util.cc:125
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
 msgid "Yes"
 msgstr "CÃ³"
 
-#:src/cmdline/cmdline_prompt.cc:380 src/ui.cc:859 src/vscreen/vs_util.cc:125
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
 msgid "No"
 msgstr "KhÃ´ng"
 
-#:src/cmdline/cmdline_prompt.cc:384
-#,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:385
-#,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:396
-#,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:501
-#,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 mÃ  sáº½ KHÃ”NG Ä‘Æ°á»£c cÃ i:\n"
 
-#:src/cmdline/cmdline_prompt.cc:507
-#,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á»Š mÃ  sáº½ KHÃ”NG Ä‘Æ°á»£c cÃ i:\n"
 
-#:src/cmdline/cmdline_prompt.cc:512
-#,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:514
-#,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:518
-#,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:520
-#,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:522
-#,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:529
-#,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:532
-#,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:539
-#,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:542
-#,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:588
-#,c-format
-msgid "Bad action character '%c'\n"
-msgstr "KÃ½ tá»± hÃ nh Ä‘á»™ng sai '%c'\n"
-
-#:src/cmdline/cmdline_prompt.cc:663
-#,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"
+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:665 src/cmdline/cmdline_prompt.cc:696
-#,c-format
+#: 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:692
-#,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:732
-#,c-format
+#: src/cmdline/cmdline_prompt.cc:610
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "HÃ£y báº¥m phÃm Return Ä‘á»ƒ tiáº¿p tá»¥c."
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "KhuÃ´n dáº¡ng hiá»ƒn thá»‹ cho khung xem gÃ³i tin."
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "^CÃ i / loáº¡i bá» gÃ³i"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "Theo Ä‘Ã¢y cÃ³ nhá»¯ng gÃ³i Má»šI sáº½ Ä‘Æ°á»£c cÃ i tá»± Ä‘á»™ng:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "^CÃ i / loáº¡i bá» gÃ³i"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "^QuÃªn cÃ¡c gÃ³i má»›i"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - Giá»¯ láº¡i gÃ³i (_cáº§m_)\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - _ÄÃ¡nh dáº¥u_ gÃ³i nhÆ° lÃ  Ä‘Æ°á»£c cÃ i Ä‘áº·t _tá»± Ä‘á»™ng_\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr ""
+" unmarkauto   - ÄÃ¡nh dáº¥u gÃ³i nhÆ° lÃ  Ä‘Æ°á»£c cÃ i Ä‘áº·t thá»§ cÃ´ng (_bá» dáº¥u tá»± "
+"Ä‘Ã´ng_)\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "khuyáº¿n khÃch"
+
+#: 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"
@@ -600,518 +836,560 @@
 "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"
 "\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "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"
 "\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "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"
 "\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "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"
 "\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "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"
 "\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "Sáº½ khÃ´ng hiá»ƒn thá»‹ cÃ¡ch thay Ä‘á»•i cá»¡.\n"
 "\n"
 
-#:src/cmdline/cmdline_prompt.cc:794
-#,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"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_resolver.cc:108
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:110
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:112
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "ThoÃ¡t khá»i chÆ°Æ¡ng trÃ¬nh"
+
+#: src/cmdline/cmdline_resolver.cc:114
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:116
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
 msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"Lá»‡nh cÃ³ thá»ƒ dÃ¹ng:\n"
-"  y: tiáº¿p tá»¥c cÃ i (_CÃ³_)\n"
-"  n: há»§y bá» rá»“i thoÃ¡t (_khÃ´ng_)\n"
-"  i: hiá»ƒn thá»‹ _thÃ´ng tin_ vá» má»™t hay nhiá»u gÃ³i tin;\n"
-"     cÃ¡c tÃªn gÃ³i nÃªn theo 'i'\n"
-"  c: hiá»ƒn thá»‹ báº£n ghi _thay Ä‘á»•i_ cá»§a má»™t hay nhiá»u gÃ³i tin;\n"
-"     cÃ¡c tÃªn gÃ³i nÃªn theo 'c'\n"
-"  d: báºt táº¯t hiá»ƒn thá»‹ thÃ´ng tin vá» cÃ¡ch _phá»¥ thuá»™c_\n"
-"  s: báºt táº¯t hiá»ƒn thá»‹ thÃ´ng tin vá» cÃ¡ch thay Ä‘á»•i _cá»¡_ gÃ³i tin\n"
-"  v: báºt táº¯t hiá»ƒn thá»‹ sá»‘ _phiÃªn báº£n_\n"
-"  e: _vÃ o_ giao diá»‡n trá»±c quan toÃ n bá»™\n"
-"\n"
-"Báº¡n cÅ©ng cÃ³ láº½ ghi rÃµ cÃ¡ch sá»a Ä‘á»•i nhÃ³m hÃ nh Ä‘á»™ng vá» gÃ³i tin.\n"
-"Äá»ƒ lÃ m nhÆ° tháº¿, hÃ£y gÃµ má»™t chá»¯ hÃ nh Ä‘á»™ng (nhÆ° bÃªn dÆ°á»›i)\n"
-"vá»›i má»™t hay nhiá»u tÃªn gÃ³i hay máº«u theo sau.\n"
-"HÃ nh Ä‘á»™ng áº¥y sáº½ Ã¡p dá»¥ng vÃ o má»i gÃ³i trong nhá»¯ng gÃ³i áº¥y.\n"
-"Báº¡n cÃ³ thá»ƒ ghi rÃµ nhá»¯ng hÃ nh Ä‘á»™ng thÃªm:\n"
-"má»—i hÃ nh Ä‘á»™ng thÃªm sáº½ Ã¡p dá»¥ng vÃ o má»i gÃ³i tin theo sau nÃ³.\n"
-"  \n"
-"HÃ nh Ä‘á»™ng:\n"
-"  + : CÃ i\n"
-"  - : Loáº¡i bá»\n"
-"  _ : Táº©y\n"
-"  = : Giá»¯ láº¡i\n"
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
 
-#:src/cmdline/cmdline_prompt.cc:818
-#,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"
+#: src/cmdline/cmdline_resolver.cc:169
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+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_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:212
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:222
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Theo Ä‘Ã¢y cÃ³ nhá»¯ng gÃ³i bá»‹ NGáº®T:"
+
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 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
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "Gáº·p lá»—i khi tÃ¢p tin tÃnh tráº¡ng."
+
+#: src/cmdline/cmdline_resolver.cc:250
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+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"
+
+#: src/cmdline/cmdline_resolver.cc:260
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:288
+#, fuzzy
+msgid "Invalid response; please enter 'y' or '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"
+
+#: src/cmdline/cmdline_resolver.cc:297
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:302
+msgid "No more solutions."
+msgstr ""
 
-#:src/cmdline/cmdline_search.cc:78
-#,c-format
+#: src/cmdline/cmdline_search.cc:76
+#, 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:114
-#,c-format
-msgid ""
-"Some packages had unmet dependencies.  This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming.\n"
-"\n"
-msgstr "Má»™t sá»‘ gÃ³i phá»¥ thuá»™c vÃ o pháº§n má»m chÆ°a cÃ i. CÃ³ láº½ cÃ³ nghÄ©a lÃ  báº¡n Ä‘Ã£ yÃªu cáº§u trÆ°Æ¡ng há»£p khÃ´ng thá»ƒ, hoáº·c náº¿u báº¡n Ä‘ang sá» dá»¥ng sá»± phÃ¢n phÃ¡t báº¥t Ä‘á»‹nh thÃ¬ chÆ°a cÃ³ táº¡o má»™t sá»‘ gÃ³i cáº§n thiáº¿t, hoáº·c chÆ°a di Ä‘á»™ng chÃºng ra Incoming (Äáº¿n vÃ o).\n"
-
-#:src/cmdline/cmdline_show_broken.cc:115
-#,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:133
+#: src/cmdline/cmdline_show.cc:133
 msgid "not installed"
 msgstr "chÆ°a cÃ i Ä‘áº·t"
 
-#:src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:237
-#:src/pkg_ver_item.cc:225
+#: src/cmdline/cmdline_show.cc:135 src/pkg_columnizer.cc:231
+#: src/pkg_ver_item.cc:225
 msgid "unpacked"
 msgstr "giáº£i nÃ©n rá»“i"
 
-#:src/cmdline/cmdline_show.cc:137
+#: src/cmdline/cmdline_show.cc:137
 msgid "partially configured"
 msgstr "cáº¥u hinh má»™t cÃ¡ch bá»™ phÃ¢n"
 
-#:src/cmdline/cmdline_show.cc:139
+#: src/cmdline/cmdline_show.cc:139
 msgid "partially installed"
 msgstr "cÃ i má»™t cÃ¡ch bá»™ phÃ¢n"
 
-#:src/cmdline/cmdline_show.cc:141
+#: src/cmdline/cmdline_show.cc:141
 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:143 src/pkg_columnizer.cc:245
-#:src/pkg_ver_item.cc:233
+#: src/cmdline/cmdline_show.cc:143 src/pkg_columnizer.cc:239
+#: src/pkg_ver_item.cc:233
 msgid "installed"
 msgstr "cÃ i Ä‘áº·t rá»“i"
 
-#:src/cmdline/cmdline_show.cc:152
+#: src/cmdline/cmdline_show.cc:152
 msgid "not a real package"
 msgstr "khÃ´ng pháº£i lÃ  gÃ³i tháºt"
 
-#:src/cmdline/cmdline_show.cc:165
+#: src/cmdline/cmdline_show.cc:165
 msgid " [held]"
 msgstr " [Ä‘Ã£ giá»¯ láº¡i]"
 
-#:src/cmdline/cmdline_show.cc:174
-#,c-format
+#: src/cmdline/cmdline_show.cc:174
+#, c-format
 msgid "%s; version %s will be installed"
 msgstr "%s; sáº½ cÃ i phiÃªn báº£n %s"
 
-#:src/cmdline/cmdline_show.cc:178
-#,c-format
+#: src/cmdline/cmdline_show.cc:178
+#, 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:184 src/cmdline/cmdline_show.cc:199
-#,c-format
+#: src/cmdline/cmdline_show.cc:184 src/cmdline/cmdline_show.cc:199
+#, c-format
 msgid "%s; will be purged"
 msgstr "%s; sáº½ bá»‹ táº©y"
 
-#:src/cmdline/cmdline_show.cc:197
-#,c-format
+#: src/cmdline/cmdline_show.cc:197
+#, 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:204
-#,c-format
+#: src/cmdline/cmdline_show.cc:204
+#, 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:206
-#,c-format
+#: src/cmdline/cmdline_show.cc:206
+#, c-format
 msgid "%s; will be removed"
 msgstr "%s; sáº½ bá»‹ loáº¡i bá»"
 
-#:src/cmdline/cmdline_show.cc:220
-#,c-format
+#: src/cmdline/cmdline_show.cc:220
+#, 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:223
-#,c-format
+#: src/cmdline/cmdline_show.cc:223
+#, 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:235 src/cmdline/cmdline_show.cc:256
+#: src/cmdline/cmdline_show.cc:235 src/cmdline/cmdline_show.cc:256
 msgid "Package: "
 msgstr "GÃ³i:"
 
-#:src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
-#:src/pkg_columnizer.cc:93
+#: src/cmdline/cmdline_show.cc:236 src/cmdline/cmdline_show.cc:264
+#: src/pkg_columnizer.cc:87
 msgid "State"
 msgstr "TÃnh tráº¡ng"
 
-#:src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
+#: src/cmdline/cmdline_show.cc:237 src/cmdline/cmdline_show.cc:318
 msgid "Provided by"
 msgstr "Cung cáº¥p bá»Ÿi"
 
-#:src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:107
+#: src/cmdline/cmdline_show.cc:258 src/pkg_info_screen.cc:105
 msgid "Essential: "
 msgstr "Chá»§ yáº¿u:"
 
-#:src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
-#:src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:107
+#: src/cmdline/cmdline_show.cc:258 src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:273 src/pkg_info_screen.cc:105
 msgid "yes"
 msgstr "cÃ³"
 
-#:src/cmdline/cmdline_show.cc:262
+#: src/cmdline/cmdline_show.cc:262
 msgid "New"
 msgstr "Má»›i"
 
-#:src/cmdline/cmdline_show.cc:267
+#: src/cmdline/cmdline_show.cc:267
 msgid "Forbidden version"
 msgstr "PhiÃªn báº£n bá»‹ cáº¥m"
 
-#:src/cmdline/cmdline_show.cc:271
+#: src/cmdline/cmdline_show.cc:271
 msgid "Automatically installed"
 msgstr "Tá»± Ä‘á»™ng cÃ i Ä‘áº·t"
 
-#:src/cmdline/cmdline_show.cc:273
+#: src/cmdline/cmdline_show.cc:273
 msgid "no"
 msgstr "khÃ´ng"
 
-#:src/cmdline/cmdline_show.cc:275
+#: src/cmdline/cmdline_show.cc:275
 msgid "Version: "
 msgstr "PhiÃªn báº£n:"
 
-#:src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:115
+#: src/cmdline/cmdline_show.cc:276 src/pkg_info_screen.cc:113
 msgid "Priority: "
 msgstr "Æ¯u tiÃªn:"
 
-#:src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
-#:src/cmdline/cmdline_show.cc:288
+#: src/cmdline/cmdline_show.cc:277 src/cmdline/cmdline_show.cc:279
+#: src/cmdline/cmdline_show.cc:288
 msgid "N/A"
 msgstr "âŒ€ cÃ³"
 
-#:src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:116
+#: src/cmdline/cmdline_show.cc:278 src/pkg_info_screen.cc:114
 msgid "Section: "
 msgstr "Pháº§n:"
 
-#:src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:117
+#: src/cmdline/cmdline_show.cc:280 src/pkg_info_screen.cc:115
 msgid "Maintainer: "
 msgstr "Báº£o quáº£n trá»‹:"
 
-#:src/cmdline/cmdline_show.cc:283
+#: src/cmdline/cmdline_show.cc:283
 msgid "Uncompressed Size: "
 msgstr "Cá»¡ Ä‘Ã£ giáº£i nÃ©n:"
 
-#:src/cmdline/cmdline_show.cc:287
+#: src/cmdline/cmdline_show.cc:287
 msgid "Architecture: "
 msgstr "Kiáº¿n trÃºc:"
 
-#:src/cmdline/cmdline_show.cc:289
+#: src/cmdline/cmdline_show.cc:289
 msgid "Compressed Size: "
 msgstr "Cá»¡ Ä‘Ã£ nÃ©n:"
 
-#:src/cmdline/cmdline_show.cc:291
+#: src/cmdline/cmdline_show.cc:291
 msgid "Filename: "
 msgstr "TÃªn táºp tin:"
 
-#:src/cmdline/cmdline_show.cc:293
 # Do not translate/ Ä‘á»«ng dá»‹ch
+#: src/cmdline/cmdline_show.cc:293
 msgid "MD5sum: "
 msgstr "MD5sum: "
 
-#:src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
+#: src/cmdline/cmdline_show.cc:297 src/cmdline/cmdline_show.cc:299
 msgid "Archive"
 msgstr "Kho"
 
-#:src/cmdline/cmdline_show.cc:303
+#: src/cmdline/cmdline_show.cc:303
 msgid "Depends"
 msgstr "Phá»¥ thuá»™c "
 
-#:src/cmdline/cmdline_show.cc:305
+#: src/cmdline/cmdline_show.cc:305
 msgid "PreDepends"
 msgstr "Phá»¥ thuá»™c trÆ°á»›c"
 
-#:src/cmdline/cmdline_show.cc:307
+#: src/cmdline/cmdline_show.cc:307
 msgid "Recommends"
 msgstr "Khuyáº¿n khÃch"
 
-#:src/cmdline/cmdline_show.cc:309
+#: src/cmdline/cmdline_show.cc:309
 msgid "Suggests"
 msgstr "Äá»‡ nghá»‹"
 
-#:src/cmdline/cmdline_show.cc:311
+#: src/cmdline/cmdline_show.cc:311
 msgid "Conflicts"
 msgstr "Xung Ä‘á»™t"
 
-#:src/cmdline/cmdline_show.cc:313
+#: src/cmdline/cmdline_show.cc:313
 msgid "Replaces"
 msgstr "Thay tháº¿"
 
-#:src/cmdline/cmdline_show.cc:315
+#: src/cmdline/cmdline_show.cc:315
 msgid "Obsoletes"
 msgstr "LÃ m cho cÅ©"
 
-#:src/cmdline/cmdline_show.cc:317
+#: src/cmdline/cmdline_show.cc:317
 msgid "Provides"
 msgstr "Cung cáº¥p"
 
-#:src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:99
+#: src/cmdline/cmdline_show.cc:321 src/pkg_info_screen.cc:97
 msgid "Description: "
 msgstr "MÃ´ táº£:"
 
-#:src/cmdline/cmdline_simulate.cc:36
-#,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:47
+#: 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:67
-#,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:81
-#,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:91
-#,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:97
-#,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"
+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"
 
-#:src/cmdline/cmdline_util.cc:127
-#,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:137
+#: src/dep_item.cc:137
 msgid "UNSATISFIED"
 msgstr "CÃ’N NGá»œ"
 
-#:src/dep_item.cc:137 src/reason_fragment.cc:247
+#: src/dep_item.cc:137 src/reason_fragment.cc:247
 msgid "UNAVAILABLE"
 msgstr "KHÃ”NG CÃ“"
 
-#:src/download_bar.cc:55 src/download_list.cc:251
-#,c-format
-msgid ""
-"Please insert the following disc into the drive \"%s\":\n"
-"%s"
-msgstr "HÃ£y náº¡p Ä‘Ä©a nÃ y vÃ o á»• \"%s\":\n"
-"%s"
+#: src/download_bar.cc:56 src/download_list.cc:263 src/download_screen.cc:57
+#, 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:74 src/generic/acqprogress.cc:57
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Láº§n ghÃ©"
 
-#:src/download_bar.cc:87
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Táº£i vá»"
 
-#:src/download_bar.cc:100
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Gá»i rá»“i"
 
-#:src/download_bar.cc:154
+#: src/download_bar.cc:157
 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:323
+#: 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?"
+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:161
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: 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:178 src/ui.cc:1238
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "XÃ³a bá» cÃ¡c táºp tin cÅ© Ä‘Ã£ táº£i vá»..."
 
-#:src/download.cc:183
-#,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:225
-#,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:231
+#: src/download.cc:230
 msgid "log report"
 msgstr "thÃ´ng bÃ¡o ghi lÆ°u"
 
-#:src/download.cc:232
-#,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"
 "\n"
-msgstr "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"
+msgstr ""
+"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:233
-#,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:235
-#,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:238
-#,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:246
-#,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:250
-#,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:260
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "LOáº I Bá»Ž"
 
-#:src/download.cc:266
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "CÃ€I"
 
-#:src/download.cc:269
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "CÃ€I Láº I"
 
-#:src/download.cc:272
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "GIá»® Láº I"
 
-#:src/download.cc:275
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "Bá»Š NGáº®T"
 
-#:src/download.cc:278
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "LOáº I VÃŒ KHÃ”NG DÃ™NG"
 
-#:src/download.cc:281
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "LOáº I Bá»Ž VI CÃCH PHá»¤ THUá»˜C"
 
-#:src/download.cc:284
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "CÃ€I VÃŒ CÃCH PHá»¤ THUá»˜C"
 
-#:src/download.cc:287
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "GIá»® Láº I VI CÃCH PHá»¤ THUá»˜C"
 
-#:src/download.cc:289
 # Do not translate/ Ä‘á»«ng dá»‹ch
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#:src/download.cc:293
-#,c-format
 # Variable: do not translate/ biáº¿n: Ä‘á»«ng dá»‹ch
+#: src/download.cc:292
+#, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#:src/download.cc:296
-#,c-format
+#: src/download.cc:295
+#, c-format
 msgid ""
 "===============================================================================\n"
 "\n"
@@ -1121,464 +1399,482 @@
 "\n"
 "Báº£n ghi hoÃ n táº¥t.\n"
 
-#:src/download.cc:331
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "TÃ i vá» gÃ³i..."
 
-#:src/download.cc:332
+#: 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:354
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "GÃ³i:"
+
+#: 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:412
+#: src/download.cc:477 src/pkg_item.cc:432
 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?)"
+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:65 src/download_item.cc:69 src/download_item.cc:99
-#:src/generic/acqprogress.cc:230
-#,c-format
+#: src/download_item.cc:66 src/download_item.cc:70 src/download_item.cc:100
+#: src/generic/acqprogress.cc:236
+#, c-format
 msgid " [Working]"
 msgstr " [Hoáº¡t Ä‘á»™ng]"
 
-#:src/download_item.cc:103 src/download_list.cc:269
+#: src/download_item.cc:104 src/download_list.cc:283
 msgid "[Hit]"
 msgstr "[Láº§n ghÃ©]"
 
-#:src/download_item.cc:103 src/download_list.cc:289
+#: src/download_item.cc:104 src/download_list.cc:303
 msgid "[Downloaded]"
 msgstr "[Táº£i vá» rá»“i]"
 
-#:src/download_list.cc:48
-#,c-format
+#: src/download_list.cc:51
+#, 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:55
+#: src/download_list.cc:57
+#, c-format
+msgid "%n%nSome files were not downloaded successfully."
+msgstr ""
+
+#: src/download_list.cc:68
 msgid "Continue"
 msgstr "Tiáº¿p tá»¥c"
 
-#:src/download_list.cc:161 src/download_screen.cc:201
+#: src/download_list.cc:175 src/download_screen.cc:203
 msgid "Total Progress: "
 msgstr "Tá»•ng tiáº¿n hÃ nh:"
 
-#:src/download_list.cc:180 src/download_screen.cc:216
-#,c-format
+#: src/download_list.cc:194 src/download_screen.cc:218
+#, c-format
 msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgstr " [ %i%% ] (%sB/s, %s cÃ²n láº¡i)"
 
-#:src/download_list.cc:182
-#,c-format
+#: src/download_list.cc:196
+#, c-format
 msgid " [ %i%% ] (stalled)"
 msgstr " [ %i%% ] (bá»‹ ngá»«ng cháº¡y)"
 
-#:src/download_list.cc:184
-#,c-format
 # Variable: do not translate/ biáº¿n: Ä‘á»«ng dá»‹ch
+#: src/download_list.cc:198
+#, c-format
 msgid " [ %i%% ]"
 msgstr " [ %i%% ]"
 
-#:src/download_list.cc:309
+#: src/download_list.cc:323
 msgid "[IGNORED]"
 msgstr "[Bá»Š Bá»Ž QUA]"
 
-#:src/download_list.cc:313
+#: src/download_list.cc:329
 msgid "[ERROR]"
 msgstr "[Lá»–I]"
 
-#:src/download_screen.cc:55
-#,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_screen.cc:179
-#,c-format
+#: src/download_screen.cc:181
+#, 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:158
+#: src/edit_pkg_hier.cc:158
 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:258
+#: src/edit_pkg_hier.cc:258
 msgid "Couldn't open for writing"
 msgstr "KhÃ´ng thá»ƒ má»Ÿ Ä‘á»ƒ ghi."
 
-#:src/generic/acqprogress.cc:81
+#: src/generic/acqprogress.cc:87
 msgid "Get:"
 msgstr "Gá»i:"
 
-#:src/generic/acqprogress.cc:112
+#: src/generic/acqprogress.cc:118
 msgid "Ign "
 msgstr "Bá»q"
 
-#:src/generic/acqprogress.cc:116
+#: src/generic/acqprogress.cc:122
 msgid "Err "
 msgstr "Lá»—i"
 
-#:src/generic/acqprogress.cc:136
-#,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:276
-#,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"
-msgstr "Thay Ä‘á»•i phÆ°Æ¡ng tiá»‡n: hÃ£y náº¡p Ä‘Ä©a cÃ³ nhan '%s' vÃ o á»• '%s' vÃ  báº¥m phÃm Enter.\n"
+msgstr ""
+"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:248
+#: 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:255 src/generic/aptcache.cc:307
-#:src/generic/aptcache.cc:309
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Äá»c thÃ´ng tin tÃnh tráº¡ng kÃ©o dÃ i..."
 
-#:src/generic/aptcache.cc:315 src/generic/aptcache.cc:389
-#:src/generic/aptcache.cc:392
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Khá»Ÿi Ä‘á»™ng tÃnh tráº¡ng cá»§a cÃ¡c gÃ³i..."
 
-#:src/generic/aptcache.cc:503
+#: 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:507 src/generic/aptcache.cc:562
-#:src/generic/aptcache.cc:565
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "Ghi thÃ´ng tin tÃnh tráº¡ng kÃ©o dÃ i..."
 
-#:src/generic/aptcache.cc:544
-#,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:553
+#: 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:570
+#: 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:586
+#: 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:962
+#: 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:1322
+#: 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:1329
+#: 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:1332
+#: 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:143
-#,c-format
-msgid "Unable to open %s for writing"
-msgstr "KhÃ´ng thá»ƒ má»Ÿ %s Ä‘á»ƒ ghi."
+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:153
-#,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:232
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
-msgstr "Cáº£nh bÃ¡o: khÃ´ng thá»ƒ khÃ³a táºp tin nhá»› táº¡m nÃªn má»Ÿ nÃ³ trong cháº¿ Ä‘á»™ chá»‰ Ä‘á»c."
+msgstr ""
+"Cáº£nh bÃ¡o: khÃ´ng thá»ƒ khÃ³a táºp tin nhá»› táº¡m nÃªn má»Ÿ nÃ³ trong cháº¿ Ä‘á»™ chá»‰ Ä‘á»c."
 
-#:src/generic/matchers.cc:779
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "ChÆ°a khá»›p '('"
 
-#:src/generic/matchers.cc:869 src/generic/matchers.cc:948
-#,c-format
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
+#, c-format
 msgid "Unknown dependency type: %s"
 msgstr "KhÃ´ng biáº¿t kiá»ƒu cÃ¡ch phá»¥ thuá»™c: %s"
 
-#:src/generic/matchers.cc:930
-#,c-format
+#: src/generic/matchers.cc:950
+#, c-format
 msgid "Unknown action type: %s"
 msgstr "KhÃ´ng biá»ƒu kiá»ƒu hÃ nh Ä‘á»™ng: %s"
 
-#:src/generic/matchers.cc:997
-#,c-format
+#: src/generic/matchers.cc:1017
+#, c-format
 msgid "Unknown priority %s"
 msgstr "KhÃ´ng biáº¿t Æ°u tiÃªn %s"
 
-#:src/generic/matchers.cc:1019
-#,c-format
+#: src/generic/matchers.cc:1039
+#, c-format
 msgid "Unknown pattern type: %c"
 msgstr "KhÃ´ng biáº¿t kiá»ƒu máº«u: %c"
 
-#:src/generic/matchers.cc:1064
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "Biá»ƒu thá»©c rá»—ng báº¥t ngá»"
 
-#:src/generic/matchers.cc:1099
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "Biá»ƒu thá»©c dáº¡ng sai"
 
-#:src/generic/matchers.cc:1128
+#: src/generic/matchers.cc:1148
 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)"
-msgstr "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."
+msgstr ""
+"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."
+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:105
+#: src/generic/pkg_changelog.cc:105
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
-msgstr "KhÃ´ng thá»ƒ gÃ³i giÃ¡ trá»‹ cá»§a $HOME (nhÃ ) dÃ¹ng TMPDIR (thÆ° má»¥c táº¡m), cÃ¡ch khÃ´ng báº£o máºt."
+msgstr ""
+"KhÃ´ng thá»ƒ gÃ³i giÃ¡ trá»‹ cá»§a $HOME (nhÃ ) dÃ¹ng TMPDIR (thÆ° má»¥c táº¡m), cÃ¡ch khÃ´ng "
+"báº£o máºt."
 
-#:src/generic/pkg_changelog.cc:147 src/view_changelog.cc:60
-#,c-format
+#: src/generic/pkg_changelog.cc:147 src/view_changelog.cc:61
+#, 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:294
+#: 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:301 src/generic/tasks.cc:343 src/generic/tasks.cc:345
+#: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346
 msgid "Reading task descriptions"
 msgstr "Äá»c mÃ´ táº£ tÃ¡c vá»¥..."
 
-#:src/load_config.cc:30
-#,c-format
+#: src/load_config.cc:30
+#, c-format
 msgid "Invalid entry in color definition group: \"%s\""
 msgstr "Má»¥c khÃ´ng há»£p lá»‡ trong nhÃ³m Ä‘á»‹nh nghÄ©a mÃ u: \"%s\""
 
-#:src/load_config.cc:32
-#,c-format
+#: src/load_config.cc:32
+#, c-format
 msgid "Invalid tagless entry in color definition group: \"%s\""
 msgstr "Má»¥c khÃ´ng cÃ³ tháº» khÃ´ng há»£p lá»‡ trong nhÃ³m Ä‘á»‹nh nghÄ©a mÃ u: \"%s\""
 
-#:src/load_config.cc:34
-#,c-format
+#: src/load_config.cc:34
+#, c-format
 msgid "Need exactly two colors in color definition \"%s\""
 msgstr "Cáº§n thiáº¿t Ä‘Ãºng hai mÃ u khÃ¡c trong lá»i Ä‘á»‹nh nghÄ©a \"%s\"."
 
-#:src/load_config.cc:50
-#,c-format
+#: src/load_config.cc:50
+#, c-format
 msgid "Can't parse foreground \"%s\"of color \"%s\""
 msgstr "KhÃ´ng thá»ƒ phÃ¢n tÃ¡ch cáº£nh gáº§n \"%s\" cá»§a mÃ u \"%s\"."
 
-#:src/load_config.cc:53
-#,c-format
+#: src/load_config.cc:53
+#, c-format
 msgid "Can't parse background \"%s\" of color \"%s\""
 msgstr "KhÃ´ng thá»ƒ phÃ¢n tÃ¡ch ná»n \"%s\" cá»§a mÃ u \"%s\"."
 
-#:src/load_config.cc:72 src/load_config.cc:74
-#,c-format
+#: src/load_config.cc:72 src/load_config.cc:74
+#, 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:89
-#,c-format
+#: src/load_config.cc:89
+#, 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). "
+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)."
+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:57
+#: src/load_pkgview.cc:57
 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:104
-#,c-format
+#: src/load_pkgview.cc:104
+#, 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:111 src/load_pkgview.cc:119
+#: src/load_pkgview.cc:111 src/load_pkgview.cc:119
 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:127
+#: src/load_pkgview.cc:127
 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:135
+#: src/load_pkgview.cc:135
 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:166 src/load_pkgview.cc:184
-#,c-format
+#: src/load_pkgview.cc:166 src/load_pkgview.cc:184
+#, 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:68
-#,c-format
+#: src/main.cc:69
+#, 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:71
-#,c-format
+#: src/main.cc:72
+#, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "TrÃ¬nh biÃªn dá»‹ch: g++ %s\n"
 
-#:src/main.cc:74
-#,c-format
+#: src/main.cc:75
+#, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
@@ -1586,8 +1882,8 @@
 "\n"
 "NCurses phiÃªn báº£n: %s\n"
 
-#:src/main.cc:76
-#,c-format
+#: src/main.cc:77
+#, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
@@ -1595,690 +1891,712 @@
 "\n"
 "Curses phiÃªn báº£n: %s\n"
 
-#:src/main.cc:78
-#,c-format
+#: src/main.cc:79
+#, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ phiÃªn báº£n: %s\n"
 
-#:src/main.cc:84
-#,c-format
+#: src/main.cc:85
+#, 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:86
-#,c-format
+#: src/main.cc:87
+#, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [tÃ¹y_chá»n] <hÃ nh_Ä‘á»™ng> ..."
 
-#:src/main.cc:88
-#,c-format
+#: src/main.cc:89
+#, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
-"  HÃ nh Ä‘á»™ng (náº¿u chÆ°a ghi rÃµ Ä‘iá»u nÃ o thÃ¬ trÃ¬nh aptitude sáº½ vÃ o cháº¿ Ä‘á»‡ tÃ¡c tÆ°Æ¡ng):\n"
+"  HÃ nh Ä‘á»™ng (náº¿u chÆ°a ghi rÃµ Ä‘iá»u nÃ o thÃ¬ trÃ¬nh aptitude sáº½ vÃ o cháº¿ Ä‘á»‡ tÃ¡c "
+"tÆ°Æ¡ng):\n"
 "\n"
 
-#:src/main.cc:89
-#,c-format
+#: src/main.cc:90
+#, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - _cÃ i_ / cáºp nháºt gÃ³i\n"
 
-#:src/main.cc:90
-#,c-format
+#: src/main.cc:91
+#, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - _Loáº¡i bá»_ gÃ³i\n"
 
-#:src/main.cc:91
-#,c-format
+#: src/main.cc:92
+#, 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:92
-#,c-format
+#: src/main.cc:93
+#, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Giá»¯ láº¡i gÃ³i (_cáº§m_)\n"
 
-#:src/main.cc:93
-#,c-format
+#: src/main.cc:94
+#, 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:94
-#,c-format
+#: src/main.cc:95
+#, 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:95
-#,c-format
+#: src/main.cc:96
+#, 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á»± Ä‘Ã´ng_)\n"
+msgstr ""
+" unmarkauto   - ÄÃ¡nh dáº¥u gÃ³i nhÆ° lÃ  Ä‘Æ°á»£c cÃ i Ä‘áº·t thá»§ cÃ´ng (_bá» dáº¥u tá»± "
+"Ä‘Ã´ng_)\n"
 
-#:src/main.cc:100
-#,c-format
+#: src/main.cc:101
+#, 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 - _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:101
-#,c-format
+#: src/main.cc:102
+#, 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:102
-#,c-format
+#: src/main.cc:103
+#, 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:103
-#,c-format
+#: src/main.cc:104
+#, 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 phÃ¡t_)\n"
+" dist-upgrade - _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:104
-#,c-format
+#: src/main.cc:105
+#, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - _QuÃªn_ gÃ³i nÃ o lÃ  _Â«má»›iÂ»_\n"
 
-#:src/main.cc:105
-#,c-format
+#: src/main.cc:106
+#, 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:106
-#,c-format
+#: src/main.cc:107
+#, 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:107
-#,c-format
+#: src/main.cc:108
+#, 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:108
-#,c-format
+#: src/main.cc:109
+#, 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:109
-#,c-format
+#: src/main.cc:110
+#, 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:110
-#,c-format
+#: src/main.cc:111
+#, 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:112
-#,c-format
+#: src/main.cc:113
+#, c-format
 msgid "  Options:\n"
 msgstr "  TÃ¹y chá»n:\n"
 
-#:src/main.cc:113
-#,c-format
+#: src/main.cc:114
+#, c-format
 msgid " -h             This help text\n"
 msgstr " -h             _Trá»£ giÃºp_ nÃ y\n"
 
-#:src/main.cc:114
-#,c-format
+#: src/main.cc:115
+#, 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:115
-#,c-format
+#: src/main.cc:116
+#, 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"
+msgstr " -d             Chá»‰ _táº£i vá»_ gÃ³i, chÆ°a cÃ i hay loáº¡i bá» gÃ¬.\n"
 
-#:src/main.cc:116
-#,c-format
+#: src/main.cc:117
+#, 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:117
-#,c-format
+#: src/main.cc:118
+#, 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"
+" -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:118
-#,c-format
+#: src/main.cc:119
+#, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
-" -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"
+" -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:119
-#,c-format
+#: src/main.cc:120
+#, 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"
+" -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:120
-#,c-format
+#: src/main.cc:121
+#, 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"
+msgstr " -w width       Ghi rÃµ _Ä‘á»™ rá»™ng_ hiá»ƒn thá»‹ káº¿t quáº£ tÃ¬m kiáº¿m\n"
 
-#:src/main.cc:121
-#,c-format
+#: src/main.cc:122
+#, 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:122
-#,c-format
+#: src/main.cc:123
+#, 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:123
-#,c-format
+#: src/main.cc:124
+#, 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:124
-#,c-format
+#: src/main.cc:125
+#, 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:125
-#,c-format
+#: src/main.cc:126
+#, 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"
+" -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:126
-#,c-format
+#: src/main.cc:127
+#, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
-msgstr ""
-" -t [báº£n]   	Chá»n phiÃªn báº£n Debian nÃ o nÃªn cÃ i gÃ³i.\n"
+msgstr " -t [báº£n]   \tChá»n phiÃªn báº£n Debian nÃ o nÃªn cÃ i gÃ³i.\n"
 
-#:src/main.cc:127
-#,c-format
+#: src/main.cc:128
+#, 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"
+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:128
-#,c-format
+#: src/main.cc:129
+#, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
-" --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"
+" --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:129
-#,c-format
+#: src/main.cc:130
+#, 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"
+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:130
-#,c-format
+#: src/main.cc:131
+#, 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:131
-#,c-format
+#: src/main.cc:132
+#, 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:133
-#,c-format
+#: src/main.cc:134
+#, 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"
+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:254
-#,c-format
+#: src/main.cc:255
+#, 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:300 src/main.cc:309
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "Láº : khÃ´ng biáº¿t mÃ£ tÃ¹y chá»n Ä‘Ã£ nháºn.\n"
 
-#:src/main.cc:318
+#: src/main.cc:319
 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:326
+#: src/main.cc:327
 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Ã Ã¬))."
+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Ã Ã¬))."
 
-#:src/main.cc:337
+#: src/main.cc:348
 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:392
-#,c-format
+#: src/main.cc:405
+#, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "KhÃ´ng biáº¿t lá»‡nh \"%s\".\n"
 
-#:src/main.cc:400
-#,c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "TÃ¹y chá»n khÃ´ng há»£p lÃª cho cháº¿ Ä‘á»™ tÆ°Æ¡ng tÃ¡c: -s\n"
+#: src/main.cc:412 src/main.cc:469
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:417 src/main.cc:474
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:424
+#, c-format
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
-#:src/mine/cmine.cc:85
-#,c-format
+#: src/mine/cmine.cc:93
+#, c-format
 msgid "%i/%i mines  %d %s"
 msgstr "%i/%i mÃ¬n  %d %s"
 
-#:src/mine/cmine.cc:89 src/mine/cmine.cc:96
+#: src/mine/cmine.cc:97 src/mine/cmine.cc:104
 msgid "second"
 msgstr "giÃ¢y"
 
-#:src/mine/cmine.cc:89 src/mine/cmine.cc:96
+#: src/mine/cmine.cc:97 src/mine/cmine.cc:104
 msgid "seconds"
 msgstr "giÃ¢y"
 
-#:src/mine/cmine.cc:93
-#,c-format
+#: src/mine/cmine.cc:101
+#, c-format
 msgid "Minesweeper    %s in %d %s"
 msgstr "QuÃ©t mÃ¬n    %s Ä‘Æ°á»£c %d %s"
 
-#:src/mine/cmine.cc:94
+#: src/mine/cmine.cc:102
 msgid "Won"
 msgstr "Tháº¯ng"
 
-#:src/mine/cmine.cc:94
+#: src/mine/cmine.cc:102
 msgid "Lost"
 msgstr "Thua"
 
-#:src/mine/cmine.cc:111 src/ui.cc:1187
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "QuÃ©t mÃ¬n"
 
-#:src/mine/cmine.cc:123 src/mine/cmine.cc:160
-#,c-format
+#: src/mine/cmine.cc:131 src/mine/cmine.cc:168
+#, c-format
 msgid "Could not open file \"%s\""
 msgstr "KhÃ´ng thá»ƒ má»Ÿ táºp tin \"%s\"."
 
-#:src/mine/cmine.cc:137
-#,c-format
+#: src/mine/cmine.cc:145
+#, c-format
 msgid "Could not load game from %s"
 msgstr "KhÃ´ng thá»ƒ táº£i trá» chÆ¡i tá»« %s."
 
-#:src/mine/cmine.cc:187
+#: src/mine/cmine.cc:195
 msgid "The board height must be a number"
 msgstr "Äá»™ cao báº£ng pháº£i lÃ  con sá»‘."
 
-#:src/mine/cmine.cc:199
+#: src/mine/cmine.cc:207
 msgid "The board width must be a number"
 msgstr "Äá»™ rá»™ng báº£ng pháº£i lÃ  con sá»‘."
 
-#:src/mine/cmine.cc:212
+#: src/mine/cmine.cc:220
 msgid "The number of mines must be a number"
 msgstr "Sá»‘ mÃ¬n pháº£i lÃ  con sá»‘."
 
-#:src/mine/cmine.cc:232
+#: src/mine/cmine.cc:240
 msgid "Setup custom game"
 msgstr "Thiáº¿t láºp trÃ² chÆ¡i tá»± chá»n"
 
-#:src/mine/cmine.cc:235
+#: src/mine/cmine.cc:243
 msgid "Height of board: "
 msgstr "Äá»™ cao báº£ng:"
 
-#:src/mine/cmine.cc:239
+#: src/mine/cmine.cc:247
 msgid "Width of board: "
 msgstr "Äá»™ rá»™ng báº£ng:"
 
-#:src/mine/cmine.cc:243
+#: src/mine/cmine.cc:251
 msgid "Number of mines: "
 msgstr "Sá»‘ mÃ¬n:"
 
-#:src/mine/cmine.cc:308
+#: src/mine/cmine.cc:316
 msgid "Choose difficulty level"
 msgstr "HÃ£y chá»n lá»›p khÃ³"
 
-#:src/mine/cmine.cc:310
+#: src/mine/cmine.cc:318
 msgid "Easy"
 msgstr "Dá»…"
 
-#:src/mine/cmine.cc:311
+#: src/mine/cmine.cc:319
 msgid "Medium"
 msgstr "Giá»¯a"
 
-#:src/mine/cmine.cc:312
+#: src/mine/cmine.cc:320
 msgid "Hard"
 msgstr "KhÃ³"
 
-#:src/mine/cmine.cc:313
+#: src/mine/cmine.cc:321
 msgid "Custom"
 msgstr "Tá»± chá»n"
 
-#:src/mine/cmine.cc:403
+#: src/mine/cmine.cc:411
 msgid "You have won."
 msgstr "Báº¡n tháº¯ng rá»“i."
 
-#:src/mine/cmine.cc:406
+#: src/mine/cmine.cc:414
 msgid "You lose!"
 msgstr "Báº¡n thua rá»“i."
 
-#:src/mine/cmine.cc:411
+#: src/mine/cmine.cc:419
 msgid "You die...  --More--"
 msgstr "Báº¡n cháº¿t... --ThÃªm--"
 
-#:src/mine/cmine.cc:424
+#: src/mine/cmine.cc:432
 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:427
+#: src/mine/cmine.cc:435
 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:430
+#: src/mine/cmine.cc:438
 msgid "You fall into a pit!  --More--"
 msgstr "Báº¡n rÆ¡i vÃ o báº«y!  --ThÃªm--"
 
-#:src/mine/cmine.cc:433
+#: src/mine/cmine.cc:441
 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:438
+#: src/mine/cmine.cc:446
 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:440
+#: src/mine/cmine.cc:448
 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:444
+#: src/mine/cmine.cc:452
 msgid "You turn to stone... --More--"
 msgstr "Báº¡n trá»Ÿ thÃ nh Ä‘Ã¡.  --ThÃªm--"
 
-#:src/mine/cmine.cc:446
+#: src/mine/cmine.cc:454
 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:448
+#: src/mine/cmine.cc:456
 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:452
+#: src/mine/cmine.cc:460
 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! --"
 
-#:src/mine/cmine.cc:462
+#: src/mine/cmine.cc:470
 msgid "sleep"
 msgstr "ngá»§"
 
-#:src/mine/cmine.cc:465
+#: src/mine/cmine.cc:473
 msgid "striking"
 msgstr "cÃ³ Ä‘Ã¡nh"
 
-#:src/mine/cmine.cc:468
+#: src/mine/cmine.cc:476
 msgid "death"
 msgstr "sá»± cháº¿t"
 
-#:src/mine/cmine.cc:471
+#: src/mine/cmine.cc:479
 msgid "polymorph"
 msgstr "cÃ³ thá»ƒ Ä‘á»•i hÃ¬nh"
 
-#:src/mine/cmine.cc:474
+#: src/mine/cmine.cc:482
 msgid "magic missile"
 msgstr "váºt ma thuáºt phÃ³ng ra"
 
-#:src/mine/cmine.cc:477
+#: src/mine/cmine.cc:485
 msgid "secret door detection"
 msgstr "phÃ¡t hiá»‡n cá»a bÃ máºt"
 
-#:src/mine/cmine.cc:480
+#: src/mine/cmine.cc:488
 msgid "invisibility"
 msgstr "tÃnh vÃ´ hÃ¬nh"
 
-#:src/mine/cmine.cc:483
+#: src/mine/cmine.cc:491
 msgid "cold"
 msgstr "láº¡nh"
 
-#:src/mine/cmine.cc:489
-#,c-format
+#: src/mine/cmine.cc:497
+#, 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:495
+#: src/mine/cmine.cc:503
 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:599
+#: src/mine/cmine.cc:607
 msgid "Enter the filename to load: "
 msgstr "HÃ£y gÃµ tÃªn táºp tin cáº§n táº£i:"
 
-#:src/mine/cmine.cc:606
+#: src/mine/cmine.cc:614
 msgid "Enter the filename to save: "
 msgstr "HÃ£y gÃµ tÃªn táºp tin cáº§n lÆ°u:"
 
-#:src/mine/cmine.cc:616
+#: src/mine/cmine.cc:624
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
-#:src/pkg_columnizer.cc:87
+#: src/pkg_columnizer.cc:81
 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:90 src/ui.cc:1643
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "GÃ³i"
 
-#:src/pkg_columnizer.cc:91
+#: src/pkg_columnizer.cc:85
 msgid "InstSz"
 msgstr "Cá»¡CÃ i"
 
-#:src/pkg_columnizer.cc:92
+#: src/pkg_columnizer.cc:86
 msgid "DebSz"
 msgstr "Cá»¡Deb"
 
-#:src/pkg_columnizer.cc:94
+#: src/pkg_columnizer.cc:88
 msgid "Action"
 msgstr "HÃ nh Ä‘á»™ng"
 
-#:src/pkg_columnizer.cc:95
+#: src/pkg_columnizer.cc:89
 msgid "Description"
 msgstr "MÃ´ táº£"
 
-#:src/pkg_columnizer.cc:96
+#: src/pkg_columnizer.cc:90
 msgid "InstVer"
 msgstr "PhbCÃ i"
 
-#:src/pkg_columnizer.cc:97
+#: src/pkg_columnizer.cc:91
 msgid "CandVer"
 msgstr "PhbÆ¯ng"
 
-#:src/pkg_columnizer.cc:98
+#: src/pkg_columnizer.cc:92
 msgid "LongState"
 msgstr "Tráº¡ngDÃ i"
 
-#:src/pkg_columnizer.cc:99
+#: src/pkg_columnizer.cc:93
 msgid "LongAction"
 msgstr "HÃ nhÄDÃ i"
 
-#:src/pkg_columnizer.cc:100
+#: src/pkg_columnizer.cc:94
 msgid "Maintainer"
 msgstr "Báº£o quáº£n trá»‹"
 
-#:src/pkg_columnizer.cc:101
+#: src/pkg_columnizer.cc:95
 msgid "Priority"
 msgstr "Æ¯u tiÃªn"
 
-#:src/pkg_columnizer.cc:102
+#: src/pkg_columnizer.cc:96
 msgid "Section"
 msgstr "Pháº§n"
 
-#:src/pkg_columnizer.cc:103
+#: src/pkg_columnizer.cc:97
 msgid "RC"
 msgstr "Giá»¯"
 
-#:src/pkg_columnizer.cc:104
+#: src/pkg_columnizer.cc:98
 msgid "Auto"
 msgstr "Tá»±Ä"
 
-#:src/pkg_columnizer.cc:105
+#: src/pkg_columnizer.cc:99
 msgid "Tag"
 msgstr "Tháº»"
 
-#:src/pkg_columnizer.cc:108
+#: src/pkg_columnizer.cc:102
 msgid "ProgName"
 msgstr "TÃªnChT"
 
-#:src/pkg_columnizer.cc:109
+#: src/pkg_columnizer.cc:103
 msgid "ProgVer"
 msgstr "PhBChT"
 
-#:src/pkg_columnizer.cc:110
+#: src/pkg_columnizer.cc:104
 msgid "#Broken"
 msgstr "#bá»‹ ngáº¯t"
 
-#:src/pkg_columnizer.cc:111
+#: src/pkg_columnizer.cc:105
 msgid "DiskUsage"
 msgstr "Chá»—ÄÄ©a"
 
-#:src/pkg_columnizer.cc:112
+#: src/pkg_columnizer.cc:106
 msgid "DownloadSize"
 msgstr "Cá»¡Táº£iVá»"
 
-#:src/pkg_columnizer.cc:132 src/pkg_columnizer.cc:144 src/pkg_ver_item.cc:103
-#:src/pkg_ver_item.cc:168
+#: src/pkg_columnizer.cc:126 src/pkg_columnizer.cc:138 src/pkg_ver_item.cc:103
+#: src/pkg_ver_item.cc:168
 msgid "<N/A>"
 msgstr "<âŒ€ cÃ³>"
 
-#:src/pkg_columnizer.cc:174 src/pkg_columnizer.cc:185
+#: src/pkg_columnizer.cc:168 src/pkg_columnizer.cc:179
 msgid "<none>"
 msgstr "<khÃ´ng>"
 
-#:src/pkg_columnizer.cc:225 src/pkg_grouppolicy.cc:222
+#: src/pkg_columnizer.cc:219 src/pkg_grouppolicy.cc:222
 msgid "virtual"
 msgstr "áº£o"
 
-#:src/pkg_columnizer.cc:232 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
+#: src/pkg_columnizer.cc:226 src/pkg_ver_item.cc:212 src/pkg_ver_item.cc:220
 msgid "purged"
 msgstr "bá»‹ táº©y"
 
-#:src/pkg_columnizer.cc:239 src/pkg_ver_item.cc:227
+#: src/pkg_columnizer.cc:233 src/pkg_ver_item.cc:227
 msgid "half-config"
 msgstr "ná»a cáº¥u hÃ¬nh"
 
-#:src/pkg_columnizer.cc:241 src/pkg_ver_item.cc:229
+#: src/pkg_columnizer.cc:235 src/pkg_ver_item.cc:229
 msgid "half-install"
 msgstr "ná»a cÃ i"
 
-#:src/pkg_columnizer.cc:243 src/pkg_ver_item.cc:231
+#: src/pkg_columnizer.cc:237 src/pkg_ver_item.cc:231
 msgid "config-files"
 msgstr "tá»‡p cáº¥u hÃ¬nh"
 
-#:src/pkg_columnizer.cc:247 src/pkg_columnizer.cc:533 src/pkg_ver_item.cc:235
+#: src/pkg_columnizer.cc:241 src/pkg_columnizer.cc:525 src/pkg_ver_item.cc:235
 msgid "ERROR"
 msgstr "Lá»–I"
 
-#:src/pkg_columnizer.cc:294 src/pkg_ver_item.cc:293
+#: src/pkg_columnizer.cc:288 src/pkg_ver_item.cc:293
 msgid "hold"
 msgstr "giá»¯"
 
-#:src/pkg_columnizer.cc:299
+#: src/pkg_columnizer.cc:293
 msgid "purge"
 msgstr "táº©y"
 
-#:src/pkg_columnizer.cc:299 src/pkg_ver_item.cc:317
+#: src/pkg_columnizer.cc:293 src/pkg_ver_item.cc:317
 msgid "delete"
 msgstr "xÃ³a bá»"
 
-#:src/pkg_columnizer.cc:301 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
+#: src/pkg_columnizer.cc:295 src/pkg_ver_item.cc:215 src/pkg_ver_item.cc:299
 msgid "broken"
 msgstr "bá»‹ ngáº¯t"
 
-#:src/pkg_columnizer.cc:303 src/pkg_ver_item.cc:303 src/pkg_ver_item.cc:310
-#:src/pkg_ver_item.cc:319
+#: src/pkg_columnizer.cc:297 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:305
+#: src/pkg_columnizer.cc:299
 msgid "reinstall"
 msgstr "cÃ i láº¡i"
 
-#:src/pkg_columnizer.cc:307
+#: src/pkg_columnizer.cc:301
 msgid "upgrade"
 msgstr "cáºp nháºt"
 
-#:src/pkg_columnizer.cc:309 src/pkg_columnizer.cc:311 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:303 src/pkg_columnizer.cc:305 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 "âŒ€"
 
-#:src/pkg_columnizer.cc:339 src/pkg_columnizer.cc:360
-#:src/pkg_columnizer.cc:367 src/pkg_grouppolicy.cc:216
-#:src/pkg_info_screen.cc:115 src/pkg_info_screen.cc:116
-#:src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:374
+#: src/pkg_columnizer.cc:333 src/pkg_columnizer.cc:354
+#: src/pkg_columnizer.cc:361 src/pkg_grouppolicy.cc:216
+#: 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:347 src/pkg_ver_item.cc:353
+#: src/pkg_columnizer.cc:341 src/pkg_ver_item.cc:353
 msgid "Imp"
 msgstr "Pháº£i"
 
-#:src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:355
+#: src/pkg_columnizer.cc:343 src/pkg_ver_item.cc:355
 msgid "Req"
 msgstr "Cáº§n"
 
-#:src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:357
+#: src/pkg_columnizer.cc:345 src/pkg_ver_item.cc:357
 msgid "Std"
 msgstr "Thg"
 
-#:src/pkg_columnizer.cc:353 src/pkg_ver_item.cc:359
+#: src/pkg_columnizer.cc:347 src/pkg_ver_item.cc:359
 msgid "Opt"
 msgstr "TCh"
 
-#:src/pkg_columnizer.cc:355 src/pkg_ver_item.cc:361
+#: src/pkg_columnizer.cc:349 src/pkg_ver_item.cc:361
 msgid "Xtr"
 msgstr "Ná»¯a"
 
-#:src/pkg_columnizer.cc:357 src/pkg_ver_item.cc:363
+#: src/pkg_columnizer.cc:351 src/pkg_ver_item.cc:363
 msgid "ERR"
 msgstr "Lá»–I"
 
-#:src/pkg_columnizer.cc:379
-#,c-format
+#: src/pkg_columnizer.cc:373
+#, c-format
 msgid "#Broken: %ld"
 msgstr "#bá»‹ ngáº¯t: %ld"
 
-#:src/pkg_columnizer.cc:394
-#,c-format
+#: src/pkg_columnizer.cc:388
+#, c-format
 msgid "Will use %sB of disk space"
 msgstr "Sáº½ dÃ¹ng %sB chá»— trÃªn Ä‘Ä©a"
 
-#:src/pkg_columnizer.cc:402
-#,c-format
+#: src/pkg_columnizer.cc:396
+#, 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:416
-#,c-format
+#: src/pkg_columnizer.cc:410
+#, c-format
 msgid "DL Size: %sB"
 msgstr "Cá»¡ táº£i vá»: %sB"
 
-#:src/pkg_columnizer.cc:486
+#: src/pkg_columnizer.cc:480
 msgid "HN too long"
 msgstr "TÃªn mÃ¡y quÃ¡ dÃ i"
 
-#:src/pkg_columnizer.cc:664
+#: src/pkg_columnizer.cc:654
 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:150
+#: src/pkg_grouppolicy.cc:150
 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 "
@@ -2286,19 +2604,21 @@
 "set of packages for a specialized task."
 msgstr ""
 "GÃ³i mÃ  thiáº¿t láºp mÃ¡y vi tÃnh báº¡n Ä‘á»ƒ thá»±c hiá»‡n má»™t tÃ¡c vá»¥ nÃ o Ä‘Ã³.\n"
-"GÃ³i trong pháº§n TÃ¡c vá»¥ (Tasks) khÃ´ng chá»©a táºp tin, chá»‰ phá»¥ thuá»™c vÃ o 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."
+"GÃ³i trong pháº§n TÃ¡c vá»¥ (Tasks) khÃ´ng chá»©a táºp tin, chá»‰ phá»¥ thuá»™c vÃ o 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:152
+#: src/pkg_grouppolicy.cc:152
 msgid ""
 "Packages with no declared section\n"
 " No section is given for these packages. Perhaps there is an error in the "
 "Packages file?"
 msgstr ""
 "GÃ³i khÃ´ng pháº£i cá»§a pháº§n riÃªng.\n"
-"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) khÃ´ng?"
-""
+"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) khÃ´ng?"
 
-#:src/pkg_grouppolicy.cc:154
+#: src/pkg_grouppolicy.cc:154
 msgid ""
 "Administrative utilities (install software, manage users, etc)\n"
 " Packages in the 'admin' section allow you to perform administrative tasks "
@@ -2306,18 +2626,21 @@
 "system, examining network traffic, and so on."
 msgstr ""
 "TrÃ¬nh tiá»‡n Ãch quáº£n lÃ½ (cÃ i pháº§n má»m, quáº£n lÃ½ ngÆ°á»i dÃ¹ng v.v.).\n"
-"GÃ³i trong pháº§n 'admin' (quáº£n lÃ½) thÃ¬ cho phÃ©p báº¡n thá»±c hiá»‡n tÃ¡c vá»¥ quáº£n lÃ½, v.d. cÃ i 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, v.v."
+"GÃ³i trong pháº§n 'admin' (quáº£n lÃ½) thÃ¬ cho phÃ©p báº¡n thá»±c hiá»‡n tÃ¡c vá»¥ quáº£n lÃ½, "
+"v.d. cÃ i 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, v.v."
 
-#:src/pkg_grouppolicy.cc:156
+#: src/pkg_grouppolicy.cc:156
 msgid ""
 "Packages converted from foreign formats (rpm, tgz, etc)\n"
 " Packages in the 'alien' section were created by the 'alien' program from a "
 "non-Debian package format such as RPM"
 msgstr ""
 "GÃ³i Ä‘Æ°á»£c chuyá»ƒn Ä‘á»•i tá»« khuÃ´n dáº¡ng khÃ¡c (rpm, tgz v.v.).\n"
-"GÃ³i trong pháº§n 'alien' (láº¡) thÃ¬ Ä‘Æ°á»£c táº¡o bá»Ÿi chÆ°Æ¡ng trÃ¬nh Â«láº¡Â» tá»« khuÃ´n dáº¡ng gÃ³i khÃ´ng pháº£i lÃ  Debian, nhÆ° RPM."
+"GÃ³i trong pháº§n 'alien' (láº¡) thÃ¬ Ä‘Æ°á»£c táº¡o bá»Ÿi chÆ°Æ¡ng trÃ¬nh Â«láº¡Â» tá»« khuÃ´n dáº¡ng "
+"gÃ³i khÃ´ng pháº£i lÃ  Debian, nhÆ° RPM."
 
-#:src/pkg_grouppolicy.cc:157
+#: src/pkg_grouppolicy.cc:157
 msgid ""
 "The Debian base system\n"
 " Packages in the 'base' section are part of the initial system installation."
@@ -2325,19 +2648,24 @@
 "Há»‡ thá»‘ng cÆ¡ báº£n Debian.\n"
 "GÃ³i trong pháº§n 'base' (cÆ¡ báº£n) thÃ¬ lÃ  pháº§n báº£n cÃ i Ä‘áº·t há»‡ thá»‘ng ban Ä‘áº§u."
 
-#:src/pkg_grouppolicy.cc:158
+#: src/pkg_grouppolicy.cc:158
+#, fuzzy
 msgid ""
 "Programs for faxmodems and other communications devices\n"
 " Packages in the 'comm' section are used to control modems and other "
 "hardware communications devices. This includes software to control faxmodems "
 "(for instance, PPP for dial-up internet connections and programs originally "
-"written for that purpose (zmodem/kermit), as well as software to control "
-"cellular phones, interface with FidoNet, and run a BBS."
+"written for that purpose, such as zmodem/kermit), as well as software to "
+"control cellular phones, interface with FidoNet, and run a BBS."
 msgstr ""
 "ChÆ°Æ¡ng trÃ¬nh cho fax-mÃ´-Ä‘em vÃ  thiáº¿t bá»‹ truyá»n thÃ´ng khÃ¡c.\n"
-"GÃ³i trong pháº§n 'comm' (liÃªn láº¡c) thÃ¬ Ä‘Æ°á»£c dÃ¹ng Ä‘á»ƒ Ä‘iá»u khiá»ƒn mÃ´-Ä‘em vÃ  nhá»¯ng thiáº¿t bá»‹ truyá»n thÃ´ng pháº§n cá»©ng khÃ¡c. GÃ³i loáº¡i áº¥y cÅ©ng bao gá»“m pháº§n má»m Ä‘iá»u khiá»ƒm fax-mÃ´-Ä‘em (v.d. pháº§n má»m PPP Ä‘á»ƒ káº¿t ná»‘i báº±ng quay sá»‘, chÆ°Æ¡ng trÃ¬nh dÃ nh cho sá»± káº¿t ná»‘i [zmodem, kermit v.v.]), vÃ  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)."
+"GÃ³i trong pháº§n 'comm' (liÃªn láº¡c) thÃ¬ Ä‘Æ°á»£c dÃ¹ng Ä‘á»ƒ Ä‘iá»u khiá»ƒn mÃ´-Ä‘em vÃ  nhá»¯ng "
+"thiáº¿t bá»‹ truyá»n thÃ´ng pháº§n cá»©ng khÃ¡c. GÃ³i loáº¡i áº¥y cÅ©ng bao gá»“m pháº§n má»m Ä‘iá»u "
+"khiá»ƒm fax-mÃ´-Ä‘em (v.d. pháº§n má»m PPP Ä‘á»ƒ káº¿t ná»‘i báº±ng quay sá»‘, chÆ°Æ¡ng trÃ¬nh "
+"dÃ nh cho sá»± káº¿t ná»‘i [zmodem, kermit v.v.]), vÃ  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:159
+#: src/pkg_grouppolicy.cc:159
 msgid ""
 "Utilities and programs for software development\n"
 " Packages in the 'devel' section are used to write new software and work on "
@@ -2348,20 +2676,25 @@
 "processing tools, and other things related to software development."
 msgstr ""
 "TrÃ¬nh tiá»‡n Ãch vÃ  chÆ°Æ¡ng trÃ¬nh Ä‘á»ƒ phÃ¡t triá»ƒn pháº§n má»m.\n"
-"GÃ³i trong pháº§n 'devel' (phat triá»ƒn) Ä‘Æ°á»£c dÃ¹ng Ä‘á»ƒ viáº¿t pháº§n má»m má»›i vÃ  sá»a Ä‘á»•i pháº§n má»m Ä‘Ã£ cÃ³. NgÆ°á»i dÃ¹ng khÃ´ng pháº£i lÃ  láºp trÃ¬nh viÃªn thÃ¬ ráº¥t cÃ³ thá»ƒ lÃ  khÃ´ng cáº§n pháº§n má»m nhiá»u tá»« pháº§n nÃ y.\n"
-"\n"
-"Pháº§n nÃ y bao gá»“m trÃ¬nh biÃªn dá»‹ch, cÃ´ng cu gá»¡ lá»—i, trÃ¬nh biÃªn soáº¡n cho láºp 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."
+"GÃ³i trong pháº§n 'devel' (phat triá»ƒn) Ä‘Æ°á»£c dÃ¹ng Ä‘á»ƒ viáº¿t pháº§n má»m má»›i vÃ  sá»a "
+"Ä‘á»•i pháº§n má»m Ä‘Ã£ cÃ³. NgÆ°á»i dÃ¹ng khÃ´ng pháº£i lÃ  láºp trÃ¬nh viÃªn thÃ¬ ráº¥t cÃ³ thá»ƒ "
+"lÃ  khÃ´ng cáº§n pháº§n má»m nhiá»u tá»« pháº§n nÃ y.\n"
+"\n"
+"Pháº§n nÃ y bao gá»“m trÃ¬nh biÃªn dá»‹ch, cÃ´ng cu gá»¡ lá»—i, trÃ¬nh biÃªn soáº¡n cho láºp "
+"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:160
+#: src/pkg_grouppolicy.cc:160
 msgid ""
 "Documentation and specialized programs for viewing documentation\n"
 " Packages in the 'doc' section document parts of the Debian system, or are "
 "viewers for documentation formats."
 msgstr ""
 "TÃ i liá»‡u, vÃ  chÆ°Æ¡ng trÃ¬nh dÃ nh cho xem tÃ i liá»‡u.\n"
-"GÃ³i trong pháº§n 'doc' (tÃ i liá»‡u) 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."
+"GÃ³i trong pháº§n 'doc' (tÃ i liá»‡u) 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:161
+#: src/pkg_grouppolicy.cc:161
 msgid ""
 "Text editors and word processors\n"
 " Packages in the 'editors' section allow you to edit plain ASCII text. These "
@@ -2369,18 +2702,21 @@
 "found in this section."
 msgstr ""
 "TrÃ¬nh hiá»‡u chá»‰nh vÄƒn báº£n vÃ  trÃ¬nh xá» lÃ½ vÄƒn báº£n trá»±c quan\n"
-"GÃ³i trong pháº§n 'editors' (trÃ¬nh hiá»‡u chá»‰nh) thÃ¬ cho phÃ©p báº¡n sá»a Ä‘á»•i vÄƒn báº£n ASCII: Â«nháºp thÃ´Â». Chá»‰ má»™t sá»‘ gÃ³i nÃ y lÃ  trÃ¬nh xá» lÃ½ vÄƒn báº£n trá»±c quan."
+"GÃ³i trong pháº§n 'editors' (trÃ¬nh hiá»‡u chá»‰nh) thÃ¬ cho phÃ©p báº¡n sá»a Ä‘á»•i vÄƒn báº£n "
+"ASCII: Â«nháºp thÃ´Â». Chá»‰ má»™t sá»‘ gÃ³i nÃ y lÃ  trÃ¬nh xá» lÃ½ vÄƒn báº£n trá»±c quan."
 
-#:src/pkg_grouppolicy.cc:162
+#: src/pkg_grouppolicy.cc:162
 msgid ""
 "Programs for working with circuits and electronics\n"
 " Packages in the 'electronics' section include circuit design tools, "
 "simulators and assemblers for microcontrollers, and other related software."
 msgstr ""
 "ChÆ°Æ¡ng trÃ¬nh cho ngÆ°á»i táº¡o vÃ  sá»a pháº§n cá»©ng\n"
-"GÃ³i trong pháº§n 'electronics' (Ä‘iá»‡n tá») thÃ¬ bao gá»“m cÃ´ng cá»¥ cáº¥u táº¡o máº¡ch Ä‘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."
+"GÃ³i trong pháº§n 'electronics' (Ä‘iá»‡n tá») thÃ¬ bao gá»“m cÃ´ng cá»¥ cáº¥u táº¡o máº¡ch "
+"Ä‘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:163
+#: src/pkg_grouppolicy.cc:163
 msgid ""
 "Programs for embedded systems\n"
 " Packages in the 'embedded' section are meant to run on embedded devices. "
@@ -2388,9 +2724,11 @@
 "a typical desktop system: for instance, a PDA, a cell phone, or a Tivo."
 msgstr ""
 "ChÆ°Æ¡ng trÃ¬nh cho há»‡ thá»‘ng nhÃºng\n"
-"GÃ³i trong pháº§n 'embedded' (nhÃºng) nÃªn cháº¡y trong thiáº¿t bá»‹ nhÃºng. Thiáº¿t 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."
+"GÃ³i trong pháº§n 'embedded' (nhÃºng) nÃªn cháº¡y trong thiáº¿t bá»‹ nhÃºng. Thiáº¿t 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:164
+#: src/pkg_grouppolicy.cc:164
 msgid ""
 "The GNOME Desktop System\n"
 " GNOME is a collection of software which provides an easy-to-use desktop "
@@ -2398,9 +2736,11 @@
 "GNOME environment or closely integrated into it."
 msgstr ""
 "Há»‡ thá»‘ng mÃ n hÃ¬nh ná»n GNOME\n"
-"GNOME lÃ  bá»™ pháº§n má»m cung cáº¥p mÃ´i trÆ°á»ng mÃ n hÃ¬nh ná»n dá»… dÃ¹ng cho há»‡ Ä‘iá»u hÃ nh Linux. GÃ³i trong pháº§n 'gnome' thuá»™c vá» mÃ´i trÆ°á»ng GNOME hoáº·c há»£p nháº¥t cháº·t cháº½ vá»›i nÃ³."
+"GNOME lÃ  bá»™ pháº§n má»m cung cáº¥p mÃ´i trÆ°á»ng mÃ n hÃ¬nh ná»n dá»… dÃ¹ng cho há»‡ Ä‘iá»u "
+"hÃ nh Linux. GÃ³i 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:165
+#: src/pkg_grouppolicy.cc:165
 msgid ""
 "Games, toys, and fun programs\n"
 " Packages in the 'games' section are meant primarily for entertainment."
@@ -2408,7 +2748,7 @@
 "TrÃ² chÆ¡i, Ä‘á»“ chÆ¡i vÃ  chÆ°Æ¡ng trÃ¬nh vui thÃº\n"
 "GÃ³i trong pháº§n 'games' (trÃ² chÆ¡i) Ä‘Æ°á»£c cáº¥u táº¡o chÃnh cho giáº£i trÃ."
 
-#:src/pkg_grouppolicy.cc:166
+#: src/pkg_grouppolicy.cc:166
 msgid ""
 "Utilities to create, view, and edit graphics files\n"
 " Packages in the 'graphics' section include viewers for image files, image "
@@ -2417,27 +2757,32 @@
 "programming tools for handling graphics."
 msgstr ""
 "TrÃ¬nh tiá»‡n Ãch Ä‘á»ƒ táº¡o, xem vÃ  hiá»‡u chá»‰nh táºp tin Ä‘á»“ há»a\n"
-"GÃ³i trong pháº§n 'graphics' (Ä‘á»“ há»a) thÃ¬ bao gá»“m trÃ¬nh xem táºp tin áº£nh, pháº§n má»m xá» lÃ½ vÃ  thao tÃ¡c áº£nh, pháº§n má»m tÆ°Æ¡ng tÃ¡c vá»›i pháº§n má»m Ä‘á»“ há»a (v.d. tháº» áº£nh Ä‘á»™ng, mÃ¡y quÃ©t vÃ  cÃ¡i mÃ¡y aÌ‰nh sá»‘), vÃ  cÃ´ng cá»¥ láºp trÃ¬nh Ä‘á»ƒ quáº£n lÃ½ Ä‘á»“ há»a."
+"GÃ³i trong pháº§n 'graphics' (Ä‘á»“ há»a) thÃ¬ bao gá»“m trÃ¬nh xem táºp tin áº£nh, pháº§n "
+"má»m xá» lÃ½ vÃ  thao tÃ¡c áº£nh, pháº§n má»m tÆ°Æ¡ng tÃ¡c vá»›i pháº§n má»m Ä‘á»“ há»a (v.d. tháº» "
+"áº£nh Ä‘á»™ng, mÃ¡y quÃ©t vÃ  cÃ¡i mÃ¡y aÌ‰nh sá»‘), vÃ  cÃ´ng cá»¥ láºp trÃ¬nh Ä‘á»ƒ quáº£n lÃ½ Ä‘á»“ "
+"há»a."
 
-#:src/pkg_grouppolicy.cc:167
+#: src/pkg_grouppolicy.cc:167
 msgid ""
 "Software for ham radio operators\n"
 " Packages in the 'hamradio' section are meant primarily for ham radio "
 "operators."
 msgstr ""
 "Pháº§n má»m cho ngÆ°á»i thao tÃ¡c raÄ‘iÃ´ nghiá»‡p dÆ°\n"
-"GÃ³i trong pháº§n 'hamradio' (raÄ‘iÃ´ nghiá»‡p dÆ°) Ä‘Æ°á»£c cáº¥u táº¡o chÃnh cho ngÆ°á»i thao tÃ¡c raÄ‘iÃ´ nghiá»‡p dÆ°."
+"GÃ³i trong pháº§n 'hamradio' (raÄ‘iÃ´ nghiá»‡p dÆ°) Ä‘Æ°á»£c cáº¥u táº¡o chÃnh cho ngÆ°á»i "
+"thao tÃ¡c raÄ‘iÃ´ nghiá»‡p dÆ°."
 
-#:src/pkg_grouppolicy.cc:168
+#: src/pkg_grouppolicy.cc:168
 msgid ""
 "Interpreters for interpreted languages\n"
 " Packages in the 'interpreters' section include interpreters for languages "
 "like Python, Perl, and Ruby, and libraries for these same languages."
 msgstr ""
 "Bá»™ phiÃªn dá»‹ch ngÃ´n ngá»¯ láºp trÃ¬nh báºc cao\n"
-"GÃ³i trong pháº§n 'interpreters' (trÃ¬nh dá»‹ch) 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."
+"GÃ³i trong pháº§n 'interpreters' (trÃ¬nh dá»‹ch) 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:169
+#: src/pkg_grouppolicy.cc:169
 msgid ""
 "The KDE Desktop System\n"
 " KDE is a collection of software which provides an easy-to-use desktop "
@@ -2445,9 +2790,11 @@
 "environment or closely integrated into it."
 msgstr ""
 "Há»‡ thá»‘ng mÃ n hÃ¬nh ná»n KDE\n"
-"KDE lÃ  má»™t bá»™ pháº§n má»m cung cáº¥p mÃ´i trÆ°á»ng mÃ n hÃ¬nh ná»n dá»… dÃ¹ng cho há»‡ Ä‘iá»u hÃ nh Linux. GÃ³i trong pháº§n 'kde' thuá»™c vá» mÃ´i trÆ°á»ng KDE hoáº·c há»£p nháº¥t cháº·t cháº½ vá»›i nÃ³."
+"KDE lÃ  má»™t bá»™ pháº§n má»m cung cáº¥p mÃ´i trÆ°á»ng mÃ n hÃ¬nh ná»n dá»… dÃ¹ng cho há»‡ Ä‘iá»u "
+"hÃ nh Linux. GÃ³i 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:170
+#: src/pkg_grouppolicy.cc:170
 msgid ""
 "Development files for libraries\n"
 " Packages in the 'libdevel' section contain files required for building "
@@ -2455,9 +2802,11 @@
 "from this section unless you want to compile software yourself."
 msgstr ""
 "Táºp tin phÃ¡t triá»ƒn cho thÆ° viÃªn\n"
-"GÃ³i trong pháº§n 'libdevel' (phÃ¡t triá»ƒn thÆ° viÃªn) thÃ¬ chá»©a nhá»¯ng táºp tin cáº§n thiáº¿t Ä‘á» xÃ¢y dá»¥ng chÆ°Æ¡ng trÃ¬nh dÃ¹ng thÆ° viÃªn trong pháº§n 'libs' cá»§a nÃ³. Báº¡n khÃ´ng cáº§n gÃ³i nÃ o tá»« pháº§n nÃ y, trá»« khi báº¡n muá»‘n tá»± biÃªn dá»‹ch pháº§n má»m."
+"GÃ³i trong pháº§n 'libdevel' (phÃ¡t triá»ƒn thÆ° viÃªn) thÃ¬ chá»©a nhá»¯ng táºp tin cáº§n "
+"thiáº¿t Ä‘á» xÃ¢y dá»¥ng chÆ°Æ¡ng trÃ¬nh dÃ¹ng thÆ° viÃªn trong pháº§n 'libs' cá»§a nÃ³. Báº¡n "
+"khÃ´ng cáº§n gÃ³i 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:171
+#: src/pkg_grouppolicy.cc:171
 msgid ""
 "Collections of software routines\n"
 " Packages in the 'libs' section provide necessary functionality for other "
@@ -2466,9 +2815,12 @@
 "install them as required to fulfill dependencies."
 msgstr ""
 "Bá»™ thÆ°á»ng trÃ¬nh pháº§n má»m\n"
-"GÃ³i trong pháº§n 'libs' (thÆ° viÃªn) thi cung cáº¥p kháº£ nÄƒng cáº§n thiáº¿t cho pháº§n má»m khÃ¡c trÃªn mÃ¡y vi tÃnh áº¥y. Ráº¥t Ãt cÃ³ báº¡n nÃªn khÃ´ng cáº§n cÃ i gÃ³i nÃ o tá»« pháº§n nÃ y; há»‡ thá»‘ng quáº£n lÃ½ gÃ³i sáº½ cÃ i gÃ³i nÃ o cáº§n thiáº¿t bá»Ÿi pháº§n má»m khÃ¡c phá»¥ thuá»™c vÃ o nÃ³."
+"GÃ³i trong pháº§n 'libs' (thÆ° viÃªn) thi cung cáº¥p kháº£ nÄƒng cáº§n thiáº¿t cho pháº§n "
+"má»m khÃ¡c trÃªn mÃ¡y vi tÃnh áº¥y. Ráº¥t Ãt cÃ³ báº¡n nÃªn khÃ´ng cáº§n cÃ i gÃ³i nÃ o tá»« "
+"pháº§n nÃ y; há»‡ thá»‘ng quáº£n lÃ½ gÃ³i sáº½ cÃ i gÃ³i nÃ o cáº§n thiáº¿t bá»Ÿi pháº§n má»m khÃ¡c "
+"phá»¥ thuá»™c vÃ o nÃ³."
 
-#:src/pkg_grouppolicy.cc:172
+#: src/pkg_grouppolicy.cc:172
 msgid ""
 "Perl interpreter and libraries\n"
 " Packages in the 'perl' section provide the Perl programming language and "
@@ -2477,9 +2829,11 @@
 "system will install them if they are required."
 msgstr ""
 "TrÃ¬nh phiÃªn dá»‹ch Perl vÃ  cÃ¡c thÆ° viÃªn cá»§a nÃ³\n"
-"GÃ³i trong pháº§n 'perl' thÃ¬ cung cáº¥p ngÃ´n ngá»¯ láºp trÃ¬nh Perl, vÃ  nhiá»u thÆ° viÃªn nhÃ³m ba cho nÃ³. Chá»‰ láºp trÃ¬nh viÃªn Perl cáº§n cÃ i riÃªng ráº½ gÃ³i nÃ o; trÃ¬nh quáº£n lÃ½ gÃ³i sáº½ cÃ i gÃ³i nÃ o cáº§n thiáº¿t."
+"GÃ³i trong pháº§n 'perl' thÃ¬ cung cáº¥p ngÃ´n ngá»¯ láºp trÃ¬nh Perl, vÃ  nhiá»u thÆ° "
+"viÃªn nhÃ³m ba cho nÃ³. Chá»‰ láºp trÃ¬nh viÃªn Perl cáº§n cÃ i riÃªng ráº½ gÃ³i nÃ o; trÃ¬nh "
+"quáº£n lÃ½ gÃ³i sáº½ cÃ i gÃ³i nÃ o cáº§n thiáº¿t."
 
-#:src/pkg_grouppolicy.cc:173
+#: src/pkg_grouppolicy.cc:173
 msgid ""
 "Python interpreter and libraries\n"
 " Packages in the 'python' section provide the Python programming language "
@@ -2488,9 +2842,11 @@
 "system will install them if they are required."
 msgstr ""
 "TrÃ¬nh phiÃªn dá»‹ch Python vÃ  cÃ¡c thÆ° viÃªn cá»§a nÃ³\n"
-"GÃ³i trong pháº§n 'python' thÃ¬ cung cáº¥p ngÃ´n ngá»¯ láºp trÃ¬nh Python, vÃ  nhiá»u 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 nÃ o; trÃ¬nh quáº£n lÃ½ gÃ³i sáº½ cÃ i gÃ³i nÃ o cáº§n thiáº¿t."
+"GÃ³i trong pháº§n 'python' thÃ¬ cung cáº¥p ngÃ´n ngá»¯ láºp trÃ¬nh Python, vÃ  nhiá»u 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 nÃ o; "
+"trÃ¬nh quáº£n lÃ½ gÃ³i sáº½ cÃ i gÃ³i nÃ o cáº§n thiáº¿t."
 
-#:src/pkg_grouppolicy.cc:174
+#: src/pkg_grouppolicy.cc:174
 msgid ""
 "Programs to write, send, and route email messages\n"
 " Packages in the 'mail' section include mail readers, mail transport "
@@ -2498,9 +2854,11 @@
 "software related to electronic mail."
 msgstr ""
 "ChÆ°Æ¡ng trÃ¬nh ghi, gá»Ÿi vÃ  lá»™ thÆ° Ä‘iá»‡n tá»\n"
-"GÃ³i trong pháº§n 'mail' (thÆ°) thÃ¬ bao gá»“m trÃ¬nh Ä‘á»c thÆ°, trÃ¬nh ná»n truyá»n 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á»."
+"GÃ³i trong pháº§n 'mail' (thÆ°) thÃ¬ bao gá»“m trÃ¬nh Ä‘á»c thÆ°, trÃ¬nh ná»n truyá»n 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:175
+#: src/pkg_grouppolicy.cc:175
 msgid ""
 "Numeric analysis and other mathematics-related software\n"
 " Packages in the 'math' section include calculators, languages for "
@@ -2508,9 +2866,11 @@
 "packages, and programs to visualize mathematical objects."
 msgstr ""
 "Pháº§n má»m phÃ¢n tÃ¡ch sá»‘ vÃ  pháº§n má»m khÃ¡c liÃªn quan Ä‘áº¿n toÃ¡n\n"
-"GÃ³i trong 'math' (toÃ¡n) thÃ¬ bao gá»“m trÃ¬nh tÃnh, ngÃ´n ngá»¯ tÃnh thuá»™c toÃ¡n (nhÆ° Mathematica), gÃ³i  Ä‘áº¡i sá»‘ tÆ°á»£ng trÆ°ng, vÃ  chÆ°Æ¡ng trÃ¬nh hiá»ƒn thá»‹ Ä‘á»‘i tÆ°á»£ng toÃ¡n."
+"GÃ³i trong 'math' (toÃ¡n) thÃ¬ bao gá»“m trÃ¬nh tÃnh, ngÃ´n ngá»¯ tÃnh thuá»™c toÃ¡n "
+"(nhÆ° Mathematica), gÃ³i  Ä‘áº¡i sá»‘ tÆ°á»£ng trÆ°ng, vÃ  chÆ°Æ¡ng trÃ¬nh hiá»ƒn thá»‹ Ä‘á»‘i "
+"tÆ°á»£ng toÃ¡n."
 
-#:src/pkg_grouppolicy.cc:176
+#: src/pkg_grouppolicy.cc:176
 msgid ""
 "Miscellaneous software\n"
 " Packages in the 'misc' section have too unusual a function to be classified."
@@ -2518,7 +2878,7 @@
 "Pháº§n má»m khÃ¡c\n"
 "GÃ³i trong pháº§n 'misc' (láº·t váº·t) khÃ´ng khá»›p vá»›i nhÃ³m nÃ o."
 
-#:src/pkg_grouppolicy.cc:177
+#: src/pkg_grouppolicy.cc:177
 msgid ""
 "Programs to connect to and provide various services\n"
 " Packages in the 'net' section include clients and servers for many "
@@ -2526,18 +2886,22 @@
 "systems, and other network-related software."
 msgstr ""
 "ChÆ°Æ¡ng trÃ¬nh káº¿t ná»‘i Ä‘áº¿n dá»‹ch vá»¥, vÃ  cung cáº¥p dá»‹ch vá»¥\n"
-"GÃ³i trong pháº§n 'net' (máº¡ng) thÃ¬ bao gá»“m trÃ¬nh khÃ¡ch vÃ  trÃ¬nh cung cáº¥p dá»‹ch vá»¥ cho nhiá»u giao thá»©c khÃ¡c nhau, cÃ´ng cá»¥ Ä‘á»ƒ thao tÃ¡c vÃ  gá»¡ lá»—i trong 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."
+"GÃ³i trong pháº§n 'net' (máº¡ng) thÃ¬ bao gá»“m trÃ¬nh khÃ¡ch vÃ  trÃ¬nh cung cáº¥p dá»‹ch "
+"vá»¥ cho nhiá»u giao thá»©c khÃ¡c nhau, cÃ´ng cá»¥ Ä‘á»ƒ thao tÃ¡c vÃ  gá»¡ lá»—i trong 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:178
+#: src/pkg_grouppolicy.cc:178
 msgid ""
 "Usenet clients and servers\n"
 " Packages in the 'news' section are related to the Usenet distributed news "
 "system.  They include news readers and news servers."
 msgstr ""
 "TrÃ¬nh khÃ¡ch vÃ  trÃ¬nh cung cáº¥p dá»‹ch vá»¥ Usenet\n"
-"GÃ³i trong 'news' (tin tá»©c) 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."
+"GÃ³i trong 'news' (tin tá»©c) 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:179
+#: src/pkg_grouppolicy.cc:179
 msgid ""
 "Obsolete libraries\n"
 " Packages in the 'oldlibs' section are obsolete and should not be used by "
@@ -2549,12 +2913,14 @@
 "to fulfill dependencies."
 msgstr ""
 "ThÆ° viÃªn cÅ©\n"
-"GÃ³i trong pháº§n 'oldlibs' (thÆ° viÃªn cÅ©) thÃ¬ lÃ  cÅ© nÃªn báº¡n nÃªn khÃ´ng sá» dá»¥ng nÃ³. GÃ³i loáº¡i nÃ y Ä‘Æ°á»£c cung cáº¥p vÃ¬ tÆ°Æ¡ng thÃch vá»›i pháº§n má»m khÃ¡c, hoáº·c pháº§n má»m khÃ¡c Ä‘Æ°á»£c phÃ¢n phÃ¡t bá»Ÿi Debian phá»¥ thuá»™c vÃ o nÃ³.\n"
+"GÃ³i trong pháº§n 'oldlibs' (thÆ° viÃªn cÅ©) thÃ¬ lÃ  cÅ© nÃªn báº¡n nÃªn khÃ´ng sá» dá»¥ng "
+"nÃ³. GÃ³i loáº¡i nÃ y Ä‘Æ°á»£c cung cáº¥p vÃ¬ tÆ°Æ¡ng thÃch vá»›i pháº§n má»m khÃ¡c, hoáº·c pháº§n "
+"má»m khÃ¡c Ä‘Æ°á»£c phÃ¢n phÃ¡t bá»Ÿi Debian phá»¥ thuá»™c vÃ o nÃ³.\n"
 "\n"
-"Ráº¥t Ãt cÃ³ báº¡n cáº§n cÃ i gÃ³i nÃ o tá»« pháº§n nÃ y; trinh quáº£n lÃ½ gÃ³i sáº½ cÃ i má»i gÃ³i cáº§n thiáº¿t."
-""
+"Ráº¥t Ãt cÃ³ báº¡n cáº§n cÃ i gÃ³i nÃ o tá»« pháº§n nÃ y; trinh quáº£n lÃ½ gÃ³i sáº½ cÃ i má»i gÃ³i "
+"cáº§n thiáº¿t."
 
-#:src/pkg_grouppolicy.cc:180
+#: src/pkg_grouppolicy.cc:180
 msgid ""
 "Emulators and software to read foreign filesystems\n"
 " Packages in the 'otherosfs' section emulate hardware and operating systems "
@@ -2565,29 +2931,35 @@
 " It is worth noting that CD burning software is included in THIS section."
 msgstr ""
 "TrÃ¬nh mÃ´ phá»ng vÃ  pháº§n má»m khÃ¡c cho phÃ©p ngÆ°á»i dÃ¹ng Ä‘á»c há»‡ thá»‘ng táºp tin láº¡\n"
-"GÃ³i trong pháº§n 'otherosfs' (há»‡ thá»‘ng táºp tin cá»§a há»‡ Ä‘iá»u hÃ nh khÃ¡c) thi mÃ´ phá»ng pháº§n cá»©ng vÃ  há»‡ Ä‘iá»u hÃ nh, vÃ  cung cáº¥p cÃ´ng cá»¥ cÃ³ thá»ƒ truyá»n dá»¯ liá»‡u giá»¯a nhá»¯ng há»‡ Ä‘iá»u hÃ nh khÃ¡c nhau vÃ   ná»n táº£ng pháº§n cá»©ng khÃ¡c nhau (v.d. trÃ¬nh tiá»‡n Ãch Ä‘á»ƒ Ä‘á»c Ä‘Ä©a má»m dáº¡ng DOS, vÃ  trÃ¬nh tiá»‡n Ãch Ä‘á»ƒ truyá»n thÃ´ng vá»›i Palm Pilot).\n"
+"GÃ³i trong pháº§n 'otherosfs' (há»‡ thá»‘ng táºp tin cá»§a há»‡ Ä‘iá»u hÃ nh khÃ¡c) thi mÃ´ "
+"phá»ng pháº§n cá»©ng vÃ  há»‡ Ä‘iá»u hÃ nh, vÃ  cung cáº¥p cÃ´ng cá»¥ cÃ³ thá»ƒ truyá»n dá»¯ liá»‡u "
+"giá»¯a nhá»¯ng há»‡ Ä‘iá»u hÃ nh khÃ¡c nhau vÃ   ná»n táº£ng pháº§n cá»©ng khÃ¡c nhau (v.d. "
+"trÃ¬nh tiá»‡n Ãch Ä‘á»ƒ Ä‘á»c Ä‘Ä©a má»m dáº¡ng DOS, vÃ  trÃ¬nh tiá»‡n Ãch Ä‘á»ƒ truyá»n thÃ´ng "
+"vá»›i Palm Pilot).\n"
 "\n"
 "Ghi chÃº: pháº§n má»m chÃ©p ra Ä‘Ä©a CD cÃ³ trong pháº§n nÃ y."
 
-#:src/pkg_grouppolicy.cc:181
+#: src/pkg_grouppolicy.cc:181
 msgid ""
 "Software for scientific work\n"
 " Packages in the 'science' section include tools for astronomy, biology, and "
 "chemistry, as well as other science-related software."
 msgstr ""
 "Pháº§n má»m Ä‘á»ƒ lÃ m viá»‡c khoa há»c\n"
-"GÃ³i trong pháº§n 'science' (khoa há»c) 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."
+"GÃ³i trong pháº§n 'science' (khoa há»c) 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:182
+#: src/pkg_grouppolicy.cc:182
 msgid ""
 "Command shells and alternative console environments\n"
 " Packages in the 'shells' section include programs providing a command-line "
 "interface."
 msgstr ""
 "Há»‡ vá» lá»‡nh vÃ  mÃ´i trÆ°Æ¡ng bÃ n giao tiáº¿p thay tháº¿\n"
-"GÃ³i trong pháº§n 'shells' (há»‡ vá») thÃ¬ bao gá»“m chÆ°Æ¡ng trÃ¬nh cung cáº¥p giao diá»‡n dÃ²ng lá»‡nh."
+"GÃ³i trong pháº§n 'shells' (há»‡ vá») thÃ¬ bao gá»“m chÆ°Æ¡ng trÃ¬nh cung cáº¥p giao diá»‡n "
+"dÃ²ng lá»‡nh."
 
-#:src/pkg_grouppolicy.cc:183
+#: src/pkg_grouppolicy.cc:183
 msgid ""
 "Utilities to play and record sound\n"
 " Packages in the 'sound' section include sound players, recorders, and "
@@ -2596,9 +2968,12 @@
 "processing software."
 msgstr ""
 "TrÃ¬nh tiá»‡n Ãch Ä‘á»ƒ phÃ¡t vÃ  ghi Ã¢m thanh\n"
-"GÃ³i trong pháº§n 'sound' (Ã¢m thanh) thÃ¬ bao gá»“m trÃ¬nh phÃ¡t Ã¢m thanh, trÃ¬nh ghi vÃ  trÃ¬nh biÃªn mÃ£ cho nhiá»u khuÃ´n dáº¡ng, mÃ¡y hoÃ  tiáº¿ng vÃ  Ä‘iá»u khiá»ƒn Ã¢m 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."
+"GÃ³i trong pháº§n 'sound' (Ã¢m thanh) thÃ¬ bao gá»“m trÃ¬nh phÃ¡t Ã¢m thanh, trÃ¬nh ghi "
+"vÃ  trÃ¬nh biÃªn mÃ£ cho nhiá»u khuÃ´n dáº¡ng, mÃ¡y hoÃ  tiáº¿ng vÃ  Ä‘iá»u khiá»ƒn Ã¢m 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:184
+#: src/pkg_grouppolicy.cc:184
 msgid ""
 "The TeX typesetting system\n"
 " Packages in the 'tex' section are related to TeX, a system for producing "
@@ -2607,9 +2982,13 @@
 "formats, TeX fonts, and other software related to TeX."
 msgstr ""
 "Há»‡ thá»‘ng sáº¯p chá»¯ TeX\n"
-"GÃ³i trong pháº§n 'tex' thÃ¬ liÃªn quan Ä‘áº¿n TeX, má»™t há»‡ thá»‘ng xuáº¥t dá»¯ liá»‡u sáº¯p chá»¯ cÃ³ cháº¥t lÆ°á»£ng cao. Bao gá»“m TeX chÃnh nÃ³, gÃ³i TeX, trÃ¬nh hiá»‡u chá»‰nh Ä‘Æ°á»£c cáº¥u táº¡o cho TeX, trÃ¬nh tiá»‡n Ãch cÃ³ thá»ƒ chuyá»ƒn Ä‘á»•i TeX vÃ  táºp tin xuáº¥t 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."
+"GÃ³i trong pháº§n 'tex' thÃ¬ liÃªn quan Ä‘áº¿n TeX, má»™t há»‡ thá»‘ng xuáº¥t dá»¯ liá»‡u sáº¯p "
+"chá»¯ cÃ³ cháº¥t lÆ°á»£ng cao. Bao gá»“m TeX chÃnh nÃ³, gÃ³i TeX, trÃ¬nh hiá»‡u chá»‰nh Ä‘Æ°á»£c "
+"cáº¥u táº¡o cho TeX, trÃ¬nh tiá»‡n Ãch cÃ³ thá»ƒ chuyá»ƒn Ä‘á»•i TeX vÃ  táºp tin xuáº¥t 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:185
+#: src/pkg_grouppolicy.cc:185
 msgid ""
 "Text processing utilities\n"
 " Packages in the 'text' section include text filters and processors, "
@@ -2619,18 +2998,23 @@
 "text."
 msgstr ""
 "TrÃ¬nh tiá»‡n Ãch xá» lÃ½ vÄƒn ban\n"
-"GÃ³i trong pháº§n 'text' (vÄƒn báº£n) thi bao gá»“m bá»™ lá»c vÄƒn báº£n vÃ  trÃ¬nh xá» lÃ½ vÄƒn báº£n, trÃ¬nh kiá»ƒm tra chÃnh táº£, trÃ¬nh tá»« Ä‘iá»ƒn, trÃ¬nh tiá»‡n Ãch chuyá»ƒn Ä‘á»•i giá»¯a báº£ng mÃ£ kÃ½ tá»± khÃ¡c nhau vÃ  khuÃ´n dáº¡ng táºp tin khÃ¡c nhau (v.d. Unix 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Ã´Â»."
+"GÃ³i trong pháº§n 'text' (vÄƒn báº£n) thi bao gá»“m bá»™ lá»c vÄƒn báº£n vÃ  trÃ¬nh xá» lÃ½ "
+"vÄƒn báº£n, trÃ¬nh kiá»ƒm tra chÃnh táº£, trÃ¬nh tá»« Ä‘iá»ƒn, trÃ¬nh tiá»‡n Ãch chuyá»ƒn Ä‘á»•i "
+"giá»¯a báº£ng mÃ£ kÃ½ tá»± khÃ¡c nhau vÃ  khuÃ´n dáº¡ng táºp tin khÃ¡c nhau (v.d. Unix 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:186
+#: src/pkg_grouppolicy.cc:186
 msgid ""
 "Various system utilities\n"
 " Packages in the 'utils' section are utilities whose purpose is too unique "
 "to be classified."
 msgstr ""
 "Nhiá»u trÃ¬nh tiá»‡n Ãch há»‡ thá»‘ng khÃ¡c nhau\n"
-"GÃ³i trong pháº§n 'utils' (trÃ¬nh tiá»‡n Ãch) thÃ¬ lÃ  trÃ¬nh tiá»‡n Ãch khÃ´ng khá»›p vá»›i nhÃ³m nÃ o."
+"GÃ³i trong pháº§n 'utils' (trÃ¬nh tiá»‡n Ãch) thÃ¬ lÃ  trÃ¬nh tiá»‡n Ãch khÃ´ng khá»›p vá»›i "
+"nhÃ³m nÃ o."
 
-#:src/pkg_grouppolicy.cc:187
+#: src/pkg_grouppolicy.cc:187
 msgid ""
 "Web browsers, servers, proxies, and other tools\n"
 " Packages in the 'web' section include Web browsers, Web servers and "
@@ -2638,9 +3022,12 @@
 "Web-based programs, and other software related to the World Wide Web."
 msgstr ""
 "TrÃ¬nh duyá»‡t Máº¡ng, trÃ¬nh cho mÃ¡y chu, mÃ¡y chá»§ á»§y nhiá»‡m, vÃ  cÃ´ng cá»¥ khÃ¡c\n"
-"GÃ³i trong pháº§n 'web' (Máº¡ng) thÃ¬ bao gá»“m trÃ¬nh duyá»‡t Máº¡ng, trÃ¬nh cho mÃ¡y chá»§ Máº¡ng vÃ  may chá»§ á»§y nhiá»‡m, pháº§n má»m Ä‘á»ƒ ghi táºp lá»‡nh CGI hoáº·c viáº¿t chÆ°Æ¡ng 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."
+"GÃ³i trong pháº§n 'web' (Máº¡ng) thÃ¬ bao gá»“m trÃ¬nh duyá»‡t Máº¡ng, trÃ¬nh cho mÃ¡y chá»§ "
+"Máº¡ng vÃ  may chá»§ á»§y nhiá»‡m, pháº§n má»m Ä‘á»ƒ ghi táºp lá»‡nh CGI hoáº·c viáº¿t chÆ°Æ¡ng "
+"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:188
+#: src/pkg_grouppolicy.cc:188
 msgid ""
 "The X window system and related software\n"
 " Packages in the 'x11' section include the core packages for the X window "
@@ -2648,9 +3035,11 @@
 "with an X GUI which were placed here because they didn't fit anywhere else."
 msgstr ""
 "Há»‡ thá»‘ng cá»a sá»• X, vÃ  pháº§n má»m liÃªn quan\n"
-"GÃ³i trong pháº§n 'x11' thÃ¬ bao gá»“m cÃ¡c gÃ³i lÃµi cho há»‡ thá»‘ng cá»a sá»• X, 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."
+"GÃ³i trong pháº§n 'x11' thÃ¬ bao gá»“m cÃ¡c gÃ³i lÃµi cho há»‡ thá»‘ng cá»a sá»• X, 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:190
+#: src/pkg_grouppolicy.cc:190
 msgid ""
 "Programs which depend on software not in Debian\n"
 " Packages in the 'contrib' section are not part of Debian.\n"
@@ -2667,11 +3056,15 @@
 "ChÆ°Æ¡ng trÃ¬nh phá»¥ thuá»™c vÃ o pháº§n má»m khÃ´ng pháº£i trong Debian\n"
 "GÃ³i trong pháº§n 'contrib' (Ä‘Ã³ng gÃ³p) khÃ´ng pháº£i thuá»™c vá» Debian.\n"
 "\n"
-"NhÆ°ng gÃ³i nÃ y lÃ  Pháº§n má»m Tá»± do, nhÆ°ng mÃ  chÃºng phá»¥ thuá»™c vÃ o pháº§n má»m khÃ´ng pháº£i thuá»™c vá» Debian. CÃ³ láº½ vÃ¬ pháº§n má»m áº¥y khÃ´ng pháº£i lÃ  Pháº§n má»m Tá»± do, vÃ  Ä‘Æ°á»£c Ä‘Ã³ng gÃ³i trong pháº§n khÃ´ng tá»± do cá»§a kho, vÃ¬ Debian khÃ´ng thá»ƒ phÃ¢n phÃ¡t nÃ³ báº±ng cÃ¡ch nÃ o cáº£, hoáº·c (ráº¥t Ãt cÃ³) vÃ¬ chÆ°a cÃ³ ai Ä‘Ã³ng gÃ³i nÃ³.\n"
+"NhÆ°ng gÃ³i nÃ y lÃ  Pháº§n má»m Tá»± do, nhÆ°ng mÃ  chÃºng phá»¥ thuá»™c vÃ o pháº§n má»m khÃ´ng "
+"pháº£i thuá»™c vá» Debian. CÃ³ láº½ vÃ¬ pháº§n má»m áº¥y khÃ´ng pháº£i lÃ  Pháº§n má»m Tá»± do, vÃ  "
+"Ä‘Æ°á»£c Ä‘Ã³ng gÃ³i trong pháº§n khÃ´ng tá»± do cá»§a kho, vÃ¬ Debian khÃ´ng thá»ƒ phÃ¢n phÃ¡t "
+"nÃ³ báº±ng cÃ¡ch nÃ o cáº£, hoáº·c (ráº¥t Ãt cÃ³) vÃ¬ chÆ°a cÃ³ ai Ä‘Ã³ng gÃ³i nÃ³.\n"
 "\n"
-"Äá»ƒ 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."
+"Äá»ƒ 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:191
+#: src/pkg_grouppolicy.cc:191
 msgid ""
 "The main Debian archive\n"
 " The Debian distribution consists of packages from the 'main' section. Every "
@@ -2681,11 +3074,13 @@
 "http://www.debian.org/social_contract#guidelines"
 msgstr ""
 "Kho Debian chÃnh\n"
-"Sá»± phÃ¢n phÃ¡t Debian chá»©a gÃ³i tá»« pháº§n 'main' (chÃnh). Má»i gÃ³i trong pháº§n chÃnh lÃ  Pháº§n má»m Tá»± do.\n"
+"Sá»± phÃ¢n phÃ¡t Debian chá»©a gÃ³i tá»« pháº§n 'main' (chÃnh). Má»i gÃ³i trong pháº§n "
+"chÃnh lÃ  Pháº§n má»m Tá»± do.\n"
 "\n"
-"Äá»ƒ 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."
+"Äá»ƒ 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:192
+#: src/pkg_grouppolicy.cc:192
 msgid ""
 "Programs stored outside the US due to export controls\n"
 " Packages in 'non-US' likely contain cryptography; a few implement patented "
@@ -2696,20 +3091,27 @@
 "the US-based archives after consulting with legal experts about recent "
 "changes in export policies. Most packages which were formerly found in this "
 "section, therefore, are now in 'main'."
-msgstr "ChÆ°Æ¡ng trÃ¬nh Ä‘Æ°á»£c cáº¥t giá»¯ bÃªn ngoáº¡i Má»¹ do Ä‘iá»u khiá»ƒn xuáº¥n kháº©u\n"
-"GÃ³i trong pháº§n 'non-US' (khÃ´ng pháº£i Má»¹) ráº¥t cÃ³ thá»ƒ chá»©a máºt mÃ£ thuáºt; má»™t vÃ i gÃ³i thá»±c hiá»‡n giáº£i thuáºt cÃ³ báº±ng phÃ¡t minh. Do Ä‘Ã³, khÃ´ng thá»ƒ xuáº¥t kháº©u gÃ³i áº¥y ra Má»¹, vÃ  Ä‘Æ°á»£c cáº¥t giá»¯ vÃ o má»™t mÃ¡y chá»§ trong Â«tháº¿ giá»›i tá»± doÂ».\n"
-"\n"
-"Ghi chÃº: Dá»± Ã¡n Debian hiá»‡n thá»i há»£p nháº¥t pháº§n má»m máºt mÃ£ vÃ o kho táº¡i Má»¹, sau khi há»i Ã½ kiáº¿n luáºt sÆ° chuyÃªn mÃ´n vá» nhÆ°ng thay Ä‘á»•i chÃnh thá»©c xuáº¥t kháº©u vá»«a 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)."
+msgstr ""
+"ChÆ°Æ¡ng trÃ¬nh Ä‘Æ°á»£c cáº¥t giá»¯ bÃªn ngoáº¡i Má»¹ do Ä‘iá»u khiá»ƒn xuáº¥n kháº©u\n"
+"GÃ³i trong pháº§n 'non-US' (khÃ´ng pháº£i Má»¹) ráº¥t cÃ³ thá»ƒ chá»©a máºt mÃ£ thuáºt; má»™t "
+"vÃ i gÃ³i thá»±c hiá»‡n giáº£i thuáºt cÃ³ báº±ng phÃ¡t minh. Do Ä‘Ã³, khÃ´ng thá»ƒ xuáº¥t kháº©u "
+"gÃ³i áº¥y ra Má»¹, vÃ  Ä‘Æ°á»£c cáº¥t giá»¯ vÃ o má»™t mÃ¡y chá»§ trong Â«tháº¿ giá»›i tá»± doÂ».\n"
+"\n"
+"Ghi chÃº: Dá»± Ã¡n Debian hiá»‡n thá»i há»£p nháº¥t pháº§n má»m máºt mÃ£ vÃ o kho táº¡i Má»¹, sau "
+"khi há»i Ã½ kiáº¿n luáºt sÆ° chuyÃªn mÃ´n vá» nhÆ°ng thay Ä‘á»•i chÃnh thá»©c xuáº¥t kháº©u vá»«a "
+"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:193
+#: src/pkg_grouppolicy.cc:193
+#, fuzzy
 msgid ""
 "Programs which are not free software\n"
 " Packages in the 'non-free' section are not part of Debian.\n"
 " .\n"
 " These packages fail to meet one or more of the requirements of the Debian "
-"Free Software Guidelines (see below) You should read the license of programs "
-"in this section to be sure that you are allowed to use them in the way you "
-"intend.\n"
+"Free Software Guidelines (see below). You should read the license of "
+"programs in this section to be sure that you are allowed to use them in the "
+"way you intend.\n"
 " .\n"
 " For more information about what Debian considers to be Free Software, see "
 "http://www.debian.org/social_contract#guidelines"
@@ -2717,70 +3119,82 @@
 "ChÆ°Æ¡ng trÃ¬nh khÃ´ng pháº£i lÃ  pháº§n má»m tá»± do\n"
 "GÃ³i trong pháº§n 'non-free' (khÃ´ng pháº£i tá»± do) khÃ´ng pháº£i thuá»™c vá» Debian.\n"
 "\n"
-"Nhá»¯ng gÃ³i nÃ y khÃ´ng thá»a má»™t hay nhiá»u tiÃªu chuáº©n cá»§a Nhá»¯ng HÆ°á»›ng dáº«n Pháº§n má»m Tá»± do Debian (Debian Free Software Guidelines: xem liÃªn káº¿t bÃªn dÆ°á»›i). Báº¡n hay Ä‘á»c báº£n quyá»n cá»§a má»i chÆ°Æ¡ng trÃ¬nh trong pháº§n nÃ y, Ä‘á»ƒ cháº¯c lÃ  nÃ³ cho phÃ©p báº¡n sá» dá»¥ng chÆ°Æ¡ng trÃ¬nh áº¥y báº±ng cÃ¡ch Ä‘á»‹nh.\n"
+"Nhá»¯ng gÃ³i nÃ y khÃ´ng thá»a má»™t hay nhiá»u tiÃªu chuáº©n cá»§a Nhá»¯ng HÆ°á»›ng dáº«n Pháº§n "
+"má»m Tá»± do Debian (Debian Free Software Guidelines: xem liÃªn káº¿t bÃªn dÆ°á»›i). "
+"Báº¡n hay Ä‘á»c báº£n quyá»n cá»§a má»i chÆ°Æ¡ng trÃ¬nh trong pháº§n nÃ y, Ä‘á»ƒ cháº¯c lÃ  nÃ³ cho "
+"phÃ©p báº¡n sá» dá»¥ng chÆ°Æ¡ng trÃ¬nh áº¥y báº±ng cÃ¡ch Ä‘á»‹nh.\n"
 "\n"
-"Äá»ƒ 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."
+"Äá»ƒ 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:195
+#: src/pkg_grouppolicy.cc:195
 msgid ""
 "Virtual packages\n"
 " These packages do not exist; they are names other packages use to require "
 "or provide some functionality."
 msgstr ""
 "GÃ³i áº£o\n"
-"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."
+"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:210
+#: src/pkg_grouppolicy.cc:210
 msgid "Tasks/Tasks"
 msgstr "TÃ¡c vá»¥/TÃ¡c vá»¥"
 
-#:src/pkg_grouppolicy.cc:210 src/pkg_grouppolicy.cc:937
+#: src/pkg_grouppolicy.cc:210 src/pkg_grouppolicy.cc:937
 msgid "Tasks"
 msgstr "TÃ¡c vá»¥"
 
-#:src/pkg_grouppolicy.cc:216
+#: src/pkg_grouppolicy.cc:216
 msgid "Unknown/Unknown"
 msgstr "KhÃ´ng biáº¿t/KhÃ´ng biáº¿t"
 
-#:src/pkg_grouppolicy.cc:222
+#: src/pkg_grouppolicy.cc:222
 msgid "virtual/virtual"
 msgstr "áº£o/áº£o"
 
-#:src/pkg_grouppolicy.cc:233
+#: src/pkg_grouppolicy.cc:233
 msgid "main"
 msgstr "chÃnh"
 
-#:src/pkg_grouppolicy.cc:318
+#: src/pkg_grouppolicy.cc:318
 msgid ""
 "Security Updates\n"
 " Security updates for these packages are available from security.debian.org."
-msgstr "TrÃ¬nh cáºp nháºt báº£o máºt\n"
+msgstr ""
+"TrÃ¬nh cáºp nháºt báº£o máºt\n"
 "TrÃ¬nh cáºp nháºt cho nhá»¯ng gÃ³i nÃ y cÃ´ng bá»‘ táº¡i nÆ¡i Máº¡ng security.debian.org"
 
-#:src/pkg_grouppolicy.cc:319
+#: src/pkg_grouppolicy.cc:319
 msgid ""
 "Upgradable Packages\n"
 " A newer version of these packages is available."
-msgstr "GÃ³i cÃ³ thá»ƒ cáºp nháºt\n"
+msgstr ""
+"GÃ³i cÃ³ thá»ƒ cáºp nháºt\n"
 "CÃ³ phiÃªn báº£n má»›i hÆ¡n cá»§a nhá»¯ng gÃ³i nÃ y."
 
-#:src/pkg_grouppolicy.cc:320
+#: src/pkg_grouppolicy.cc:320
+#, fuzzy
 msgid ""
 "New Packages\n"
 " These packages have been added to Debian since the last time you cleared "
-"the list of \"new\" packages. (choose \"Forget new packages\" from the "
-"Actions menu to empty this list)"
-msgstr "GÃ³i má»›i\n"
-"Nhá»¯ng gÃ³i nÃ y Ä‘Ã£ Ä‘Æ°á»£c thÃªm vÃ o Debian sau khi báº¡n xÃ³a danh sÃ¡ch gÃ³i \"new\" (má»›i) 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."
+"the list of \"new\" packages (choose \"Forget new packages\" from the "
+"Actions menu to empty this list)."
+msgstr ""
+"GÃ³i má»›i\n"
+"Nhá»¯ng gÃ³i nÃ y Ä‘Ã£ Ä‘Æ°á»£c thÃªm vÃ o Debian sau khi báº¡n xÃ³a danh sÃ¡ch gÃ³i \"new"
+"\" (má»›i) 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:321
+#: src/pkg_grouppolicy.cc:321
 msgid ""
 "Installed Packages\n"
 " These packages are currently installed on your computer."
-msgstr "GÃ³i Ä‘Ã£ cÃ i Ä‘áº·t\n"
+msgstr ""
+"GÃ³i Ä‘Ã£ cÃ i Ä‘áº·t\n"
 "Nhá»¯ng gÃ³i nÃ y hiá»‡n thá»i cÃ³ cÃ Ã¬ Ä‘Äƒt trÃªn mÃ¡y vi tÃnh báº¡n."
 
-#:src/pkg_grouppolicy.cc:322
+#: src/pkg_grouppolicy.cc:322
 msgid ""
 "Not Installed Packages\n"
 " These packages are not installed on your computer."
@@ -2788,7 +3202,7 @@
 "GÃ³i chÆ°a cÃ i\n"
 "Nhá»¯ng gÃ³i nÃ y hiá»‡n thá»i khÃ´ng cÃ³ cÃ i trÃªn mÃ¡y vi tÃnh báº¡n."
 
-#:src/pkg_grouppolicy.cc:323
+#: src/pkg_grouppolicy.cc:323
 msgid ""
 "Obsolete and Locally Created Packages\n"
 " These packages are currently installed on your computer, but they are not "
@@ -2796,18 +3210,21 @@
 "archive, or you may have built a private version of them yourself."
 msgstr ""
 "GÃ³i cÅ© vÃ  táº¡o cá»¥c bá»™\n"
-"Nhá»¯ng gÃ³i nÃ y hiá»‡n thá»i cÃ³ cÃ i Ä‘áº·t trÃªn mÃ¡y vi tÃnh báº¡n, nhÆ°ng mÃ  khÃ´ng thá»ƒ gá»i nÃ o trong nhá»¯ng gÃ³i nÃ y tá»« nguá»“n apt nÃ o. CÃ³ láº½ gÃ³i 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Ã³."
+"Nhá»¯ng gÃ³i nÃ y hiá»‡n thá»i cÃ³ cÃ i Ä‘áº·t trÃªn mÃ¡y vi tÃnh báº¡n, nhÆ°ng mÃ  khÃ´ng thá»ƒ "
+"gá»i nÃ o trong nhá»¯ng gÃ³i nÃ y tá»« nguá»“n apt nÃ o. CÃ³ láº½ gÃ³i 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:324
+#: src/pkg_grouppolicy.cc:324
 msgid ""
 "Virtual Packages\n"
 " These packages do not exist; they are names other packages use to require "
 "or provide some functionality."
 msgstr ""
 "GÃ³i áº£o\n"
-"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."
+"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:471
+#: src/pkg_grouppolicy.cc:471
 msgid ""
 "Packages which are recommended by other packages\n"
 " These packages are not strictly required, but they may be necessary to "
@@ -2815,9 +3232,11 @@
 "upgrading."
 msgstr ""
 "GÃ³i Ä‘Æ°á»£c khuyÃªn bá»Ÿi gÃ³i khÃ¡c\n"
-"Nhá»¯ng gÃ³i nÃ y khÃ´ng yÃªu cáº§u cháº·t cháº½, nhÆ°ng mÃ  cÃ³ láº½ cáº§n thiáº¿t Ä‘á»ƒ cung 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 hay cáºp nháºt."
+"Nhá»¯ng gÃ³i nÃ y khÃ´ng yÃªu cáº§u cháº·t cháº½, nhÆ°ng mÃ  cÃ³ láº½ cáº§n thiáº¿t Ä‘á»ƒ cung 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 hay cáºp "
+"nháºt."
 
-#:src/pkg_grouppolicy.cc:491
+#: src/pkg_grouppolicy.cc:491
 msgid ""
 "Packages which are suggested by other packages\n"
 " These packages are not required in order to make your system function "
@@ -2825,9 +3244,11 @@
 "you are currently installing."
 msgstr ""
 "GÃ³i Ä‘Æ°á»£c Ä‘á»‡ nghá»‹ bá»Ÿi gÃ³i khÃ¡c\n"
-"Nhá»¯ng gÃ³i nÃ y khÃ´ng pháº£i yÃªu cáº§u Ä‘á»ƒ mÃ  há»‡ thá»‘ng báº¡n hoáº¡t Ä‘á»™ng cho Ä‘Ãºng, 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."
+"Nhá»¯ng gÃ³i nÃ y khÃ´ng pháº£i yÃªu cáº§u Ä‘á»ƒ mÃ  há»‡ thá»‘ng báº¡n hoáº¡t Ä‘á»™ng cho Ä‘Ãºng, "
+"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:518
+#: src/pkg_grouppolicy.cc:518
 msgid ""
 "Packages with unsatisfied dependencies\n"
 " The dependency requirements of these packages will be unmet after the "
@@ -2837,11 +3258,12 @@
 "either on your system or in the Debian archive."
 msgstr ""
 "GÃ³i phá»¥ thuá»™c vÃ o gÃ³i khÃ¡c chÆ°a cÃ³\n"
-"Sau khi cÃ i Ä‘áº·t xong thÃ¬ nhá»¯ng gÃ³i nÃ y sáº½ khÃ´ng cÃ³ trÃªn mÃ¡y vi tÃnh báº¡n cÃ¡c gÃ³i khÃ¡c cáº§n thiáº¿t Ä‘á»ƒ hoáº¡t Ä‘á»™ng cho Ä‘Ãºng. \n"
+"Sau khi cÃ i Ä‘áº·t xong thÃ¬ nhá»¯ng gÃ³i nÃ y sáº½ khÃ´ng cÃ³ trÃªn mÃ¡y vi tÃnh báº¡n cÃ¡c "
+"gÃ³i khÃ¡c cáº§n thiáº¿t Ä‘á»ƒ hoáº¡t Ä‘á»™ng cho Ä‘Ãºng. \n"
 "\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:519
+#: src/pkg_grouppolicy.cc:519
 msgid ""
 "Packages being removed because they are no longer used\n"
 " These packages are being deleted because they were automatically installed "
@@ -2849,35 +3271,40 @@
 "package declaring an 'important' dependency on them.\n"
 msgstr ""
 "GÃ³i sáº½ bá»‹ loáº¡i bá» vÃ¬ khÃ´ng cÃ²n cÃ³ Ãch láº¡i\n"
-"Nhá»¯ng gÃ³i nÃ y sáº½ bá»‹ xÃ³a bá» vÃ¬ Ä‘Ã£ tá»± Ä‘á»™ng Ä‘Æ°á»£c cÃ i Ä‘á»ƒ thá»a tiÃªu chuáº©n cÃ¡ch phá»¥ thuá»™c, nhÆ°ng mÃ  hÃ nh Ä‘á»™ng Ä‘Ã£ Ä‘á»‹nh sáº½ cÃ³ káº¿t quáº£ lÃ  khÃ´ng cÃ³ gÃ³i nÃ o phá»¥ thuá»™c má»™t cÃ¡ch quan trá»ng ('important') vÃ o gÃ³i nÃ y.\n"
+"Nhá»¯ng gÃ³i nÃ y sáº½ bá»‹ xÃ³a bá» vÃ¬ Ä‘Ã£ tá»± Ä‘á»™ng Ä‘Æ°á»£c cÃ i Ä‘á»ƒ thá»a tiÃªu chuáº©n cÃ¡ch "
+"phá»¥ thuá»™c, nhÆ°ng mÃ  hÃ nh Ä‘á»™ng Ä‘Ã£ Ä‘á»‹nh sáº½ cÃ³ káº¿t quáº£ lÃ  khÃ´ng cÃ³ gÃ³i nÃ o phá»¥ "
+"thuá»™c má»™t cÃ¡ch quan trá»ng ('important') vÃ o gÃ³i nÃ y.\n"
 
-#:src/pkg_grouppolicy.cc:520
+#: src/pkg_grouppolicy.cc:520
 msgid ""
 "Packages being automatically held in their current state\n"
 " These packages could be upgraded, but they have been kept in their current "
 "state to avoid breaking dependencies."
 msgstr ""
 "GÃ³i sáº½ tá»± Ä‘á»™ng Ä‘Æ°á»£c giá»¯ láº¡i trong tÃnh tráº¡ng hiá»‡n thá»i\n"
-"CÃ³ thá»ƒ cáºp nháºt nhá»¯ng gÃ³i nÃ y, nhÆ°ng mÃ  chÆ°a lÃ m nhÆ° tháº¿ Ä‘á»ƒ trÃ¡nh ngáº¯t Ä‘Æ°á»ng dáº«n phá»¥ thuá»™c."
+"CÃ³ thá»ƒ cáºp nháºt nhá»¯ng gÃ³i 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:521
+#: src/pkg_grouppolicy.cc:521
 msgid ""
 "Packages being automatically installed to satisfy dependencies\n"
 " These packages are being installed because they are required by another "
 "package you have chosen for installation."
-msgstr "GÃ³i sáº½ tá»± Ä‘á»™ng Ä‘Æ°á»£c cÃ i Ä‘á»ƒ thá»a tiÃªu chuáº©n cÃ¡ch phá»¥ thuá»™c\n"
+msgstr ""
+"GÃ³i sáº½ tá»± Ä‘á»™ng Ä‘Æ°á»£c cÃ i Ä‘á»ƒ thá»a tiÃªu chuáº©n cÃ¡ch phá»¥ thuá»™c\n"
 "Nhá»¯ng gÃ³i 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:522
+#: src/pkg_grouppolicy.cc:522
 msgid ""
 "Packages being deleted due to unsatisfied dependencies\n"
 " These packages are being deleted because one or more of their dependencies "
 "is no longer available, or because another package conflicts with them."
 msgstr ""
 "GÃ³i sáº½ bá»‹ xÃ³a bá» do khÃ´ng thá»a tiÃªu chuáº©n cÃ¡ch phá»¥ thuá»™c\n"
-"GÃ³i 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Ã³."
+"GÃ³i 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:523
+#: src/pkg_grouppolicy.cc:523
 msgid ""
 "Packages to be downgraded\n"
 " An older version of these packages than is currently installed will be "
@@ -2886,16 +3313,17 @@
 "GÃ³i 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 nÃ y."
 
-#:src/pkg_grouppolicy.cc:524
+#: src/pkg_grouppolicy.cc:524
 msgid ""
 "Packages being held back\n"
 " These packages could be upgraded, but you have asked for them to be held at "
 "their current version."
 msgstr ""
 "GÃ³i sáº½ Ä‘Æ°á»£c giá»¯ láº¡i\n"
-"CÃ³ thá»ƒ cáºp nháºt nhá»¯ng gÃ³i nÃ y, nhÆ°ng mÃ  báº¡n Ä‘Ã£ chá»n giá»¯ láº¡i phiÃªn báº£n hiá»‡n cÃ³."
+"CÃ³ thá»ƒ cáºp nháºt nhá»¯ng gÃ³i nÃ y, nhÆ°ng mÃ  báº¡n Ä‘Ã£ chá»n giá»¯ láº¡i phiÃªn báº£n hiá»‡n "
+"cÃ³."
 
-#:src/pkg_grouppolicy.cc:525
+#: src/pkg_grouppolicy.cc:525
 msgid ""
 "Packages to be reinstalled\n"
 " These packages will be reinstalled."
@@ -2903,7 +3331,7 @@
 "GÃ³i sáº½ Ä‘Æ°á»£c cÃ i láº¡i\n"
 "Sáº½ cÃ i láº¡i nhá»¯ng gÃ³i nÃ y."
 
-#:src/pkg_grouppolicy.cc:526
+#: src/pkg_grouppolicy.cc:526
 msgid ""
 "Packages to be installed\n"
 " These packages have been manually selected for installation on your "
@@ -2912,14 +3340,15 @@
 "GÃ³i sáº½ Ä‘Æ°á»£c cÃ i\n"
 "Báº¡n Ä‘Ã£ tá»± chá»n cÃ i nhá»¯ng gÃ³i nÃ y vÃ o mÃ¡y vi tÃnh mÃ¬nh."
 
-#:src/pkg_grouppolicy.cc:527
+#: src/pkg_grouppolicy.cc:527
 msgid ""
 "Packages to be removed\n"
 " These packages have been manually selected for removal."
-msgstr "GÃ³i se bá»‹ loáº¡i bá»\n"
+msgstr ""
+"GÃ³i se bá»‹ loáº¡i bá»\n"
 "Báº¡n Ä‘Ã£ tá»± chá»n loáº¡i bá» nhá»¯ng gÃ³i nÃ y ra mÃ¡y vi tÃnh mÃ¬nh."
 
-#:src/pkg_grouppolicy.cc:528
+#: src/pkg_grouppolicy.cc:528
 msgid ""
 "Packages to be upgraded\n"
 " These packages will be upgraded to a newer version."
@@ -2927,943 +3356,1225 @@
 "GÃ³i sáº½ Ä‘Æ°á»£c cáºp nháºt\n"
 "Sáº½ cáºp nháºt nhá»¯ng gÃ³i nÃ y lÃªn phiÃªn báº£n má»›i hÆ¡n."
 
-#:src/pkg_grouppolicy.cc:643
+#: src/pkg_grouppolicy.cc:643
 msgid "unknown"
 msgstr "khÃ´ng biáº¿t"
 
-#:src/pkg_grouppolicy.cc:654
-#,c-format
+#: src/pkg_grouppolicy.cc:654
+#, c-format
 msgid "Priority %s"
 msgstr "Æ¯u tiÃªn %s"
 
-#:src/pkg_grouppolicy.cc:880
+#: src/pkg_grouppolicy.cc:880
 msgid "End-user"
 msgstr "NgÆ°á»i dÃ¹ng cuá»‘i"
 
-#:src/pkg_grouppolicy.cc:881
+#: src/pkg_grouppolicy.cc:881
 msgid "Servers"
 msgstr "MÃ¡y chá»§"
 
-#:src/pkg_grouppolicy.cc:882
+#: src/pkg_grouppolicy.cc:882
 msgid "Development"
 msgstr "PhÃ¡t triá»ƒn"
 
-#:src/pkg_grouppolicy.cc:883
+#: src/pkg_grouppolicy.cc:883
 msgid "Localization"
 msgstr "Báº£n Ä‘á»‹a hÃ³a"
 
-#:src/pkg_grouppolicy.cc:884
+#: src/pkg_grouppolicy.cc:884
 msgid "Hardware Support"
 msgstr "Há»— trá»£ pháº§n cá»©ng"
 
-#:src/pkg_grouppolicy.cc:885
+#: src/pkg_grouppolicy.cc:885
 msgid "Miscellaneous"
 msgstr "Linh tinh"
 
-#:src/pkg_grouppolicy.cc:886
+#: src/pkg_grouppolicy.cc:886
 msgid "Unrecognized tasks"
 msgstr "TÃ¡c vá»¥ chÆ°a nháºn biáº¿t"
 
-#:src/pkg_grouppolicy.cc:937
+#: src/pkg_grouppolicy.cc:937
 msgid ""
 "\n"
 " Tasks are groups of packages which provide an easy way to select a "
 "predefined set of packages for a particular purpose."
 msgstr ""
 "\n"
-"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 Ä‘Ã³."
+"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:118
+#: src/pkg_info_screen.cc:116
 msgid "Compressed size: "
 msgstr "Cá»¡ Ä‘Ã£ nÃ©n:"
 
-#:src/pkg_info_screen.cc:119
+#: src/pkg_info_screen.cc:117
 msgid "Uncompressed size: "
 msgstr "Cá»¡ giáº£i nÃ©n:"
 
-#:src/pkg_info_screen.cc:120
+#: src/pkg_info_screen.cc:118
 msgid "Source Package: "
 msgstr "GÃ³i nguá»“n"
 
-#:src/pkg_info_screen.cc:130
-#,c-format
+#: src/pkg_info_screen.cc:128
+#, c-format
 msgid "Package names provided by %s"
 msgstr "CÃ¡c tÃªn gÃ³i Ä‘Æ°á»£c cung cáº¥p bá»Ÿi %s"
 
-#:src/pkg_info_screen.cc:140
-#,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:145
+#: src/pkg_info_screen.cc:143
 msgid "Versions"
 msgstr "PhiÃªn báº£n"
 
-#:src/pkg_item.cc:53
+#: src/pkg_item.cc:55
 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:79
-#,c-format
+#: src/pkg_item.cc:80
+#, fuzzy, c-format
 msgid ""
-"%s is an essential package!\n"
-"\n"
-"Are you sure you want to remove it?\n"
-"Type '%s' if you are."
+"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
+"s' if you are."
 msgstr ""
 "%s lÃ  má»™t gÃ³i chá»§ yáº¿u.\n"
 "\n"
 "Báº¡n cÃ³ cháº¯c muá»‘n loáº¡i bá» nÃ³ khÃ´ng?\n"
 "HÃ£y gÃµ '%s' náº¿u cÃ³."
 
-#:src/pkg_item.cc:218
-#,c-format
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
+#, c-format
 msgid "Information about %s"
 msgstr "ThÃ´ng tin vá» %s"
 
-#:src/pkg_item.cc:303
-msgid "Available versions of "
+#: src/pkg_item.cc:224 src/pkg_ver_item.cc:627
+#, c-format
+msgid "%s info"
+msgstr ""
+
+#: src/pkg_item.cc:310
+#, fuzzy, c-format
+msgid "Available versions of %s"
 msgstr "CÃ¡c phiÃªn báº£n cÃ´ng bá»‘ cá»§a "
 
-#:src/pkg_item.cc:311 src/pkg_ver_item.cc:650
-#,c-format
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "PhiÃªn báº£n"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
+#, c-format
 msgid "Dependencies of %s"
 msgstr "%s phá»¥ thuá»™c vÃ o"
 
-#:src/pkg_item.cc:321 src/pkg_ver_item.cc:659
-#,c-format
+#: src/pkg_item.cc:327 src/pkg_ver_item.cc:657
+#, c-format
+msgid "%s deps"
+msgstr ""
+
+#: src/pkg_item.cc:338 src/pkg_ver_item.cc:667
+#, c-format
 msgid "Packages depending on %s"
 msgstr "CÃ¡c gÃ³i khÃ¡c phá»¥ thuá»™c vÃ o %s"
 
-#:src/pkg_item.cc:372 src/pkg_ver_item.cc:696
-#,c-format
+#: src/pkg_item.cc:340 src/pkg_ver_item.cc:669
+#, c-format
+msgid "%s reverse deps"
+msgstr ""
+
+#: src/pkg_item.cc:392 src/pkg_ver_item.cc:707
+#, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr "ThÃ´ng bÃ¡o lá»—i trong %s:\n"
 
-#:src/pkg_item.cc:394
+#: src/pkg_item.cc:414
+#, fuzzy
 msgid ""
-"You are not root and I cannot find any way\n"
-"to become root.  To reconfigure this package,\n"
-"install the menu package, the login package,\n"
-"or run aptitude as root."
-msgstr ""
-"Báº¡n khÃ´ng pháº£i Ä‘Ã£ Ä‘Äƒng nháºp nhÆ° lÃ  ngÆ°á»i chá»§ (root), vÃ  tÃ´i khÃ´ng thá»ƒ tÃ¬m cÃ¡ch nÃ o báº¡n cÃ³ thá»ƒ trá»Ÿ thÃ nh ngÆ°á»i chá»§, Äá»ƒ Ä‘á»‹nh cáº¥u hÃ¬nh láº¡i gÃ³i nÃ y, hÃ£y cÃ i gÃ³i trÃ¬nh Ä‘Æ¡n, cÃ i gÃ³i Ä‘Äƒng nháºp, hoáº·c cháº¡y trÃ¬nh aptitude nhÆ° lÃ  ngÆ°á»i chá»§."
+"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 ""
+"Báº¡n khÃ´ng pháº£i Ä‘Ã£ Ä‘Äƒng nháºp nhÆ° lÃ  ngÆ°á»i chá»§ (root), vÃ  tÃ´i khÃ´ng thá»ƒ tÃ¬m "
+"cÃ¡ch nÃ o báº¡n cÃ³ thá»ƒ trá»Ÿ thÃ nh ngÆ°á»i chá»§, Äá»ƒ Ä‘á»‹nh cáº¥u hÃ¬nh láº¡i gÃ³i nÃ y, hÃ£y "
+"cÃ i gÃ³i trÃ¬nh Ä‘Æ¡n, cÃ i gÃ³i Ä‘Äƒng nháºp, hoáº·c cháº¡y trÃ¬nh aptitude nhÆ° lÃ  ngÆ°á»i "
+"chá»§."
 
-#:src/pkg_item.cc:402
-#,c-format
+#: src/pkg_item.cc:422
+#, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Cáº¥u hÃ¬nh láº¡i %s\n"
 
-#:src/pkg_item.cc:427
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Bá»™ sá»a Ä‘á»•i cÃ¢y"
 
-#:src/pkg_tree.cc:326
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Bá»™ sá»a Ä‘á»•i cÃ¢y"
+
+#: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "TÃ¬m:"
 
-#:src/pkg_tree.cc:586
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Táº¥t cáº£ gÃ³i"
 
-#:src/pkg_tree.cc:599 src/pkg_tree.cc:608
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Khung xem xÃ¢y dá»¥ng"
 
-#:src/pkg_tree.cc:650
-#,c-format
+#: src/pkg_tree.cc:632
+#, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "KhÃ´ng cÃ³ gÃ³i nÃ o khá»›p máº«u \"%s\"."
 
-#:src/pkg_tree.cc:672
+#: src/pkg_tree.cc:654
 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:706
+#: src/pkg_tree.cc:688
 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:714
+#: src/pkg_tree.cc:696
 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_ver_item.cc:625
-msgid "Information about "
-msgstr "ThÃ´ng tin vá»     "
-
-#:src/pkg_view.cc:342
+#: src/pkg_view.cc:344
 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?"
+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:348
+#: src/pkg_view.cc:350
 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."
+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:441
+#: src/pkg_view.cc:443
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: (táº¡o khung xem gÃ³i) Ä‘á»‘i sá»‘ sai."
 
-#:src/pkg_view.cc:482
+#: src/pkg_view.cc:495
 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."
+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)"
 
-#:src/reason_fragment.cc:278
-#,c-format
 # Variable: do not translate/ biáº¿n: Ä‘á»«ng dá»‹ch
+#: src/reason_fragment.cc:278
+#, c-format
 msgid "%F%s %F %F"
 msgstr "%F%s %F %F"
 
-#:src/reason_fragment.cc:327
+#: src/reason_fragment.cc:327
 msgid ""
 "If you select a package, an explanation of its current state will appear in "
 "this space."
 msgstr ""
-"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."
+"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:361
+#: src/reason_fragment.cc:361
 msgid ""
 "%B%s%b was installed automatically;  it is being removed because all of the "
 "packages which depend upon it are being removed:"
 msgstr ""
-"%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á»."
+"%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:365
+#: src/reason_fragment.cc:365
 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:369
+#: src/reason_fragment.cc:369
 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:"
+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:375 src/reason_fragment.cc:387
+#: src/reason_fragment.cc:375 src/reason_fragment.cc:387
 msgid ""
 "%B%s%b cannot be upgraded now, but if it could be, it would still be held at "
 "version %B%s%b."
-msgstr "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."
+msgstr ""
+"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:378
+#: src/reason_fragment.cc:378
 msgid ""
 "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the "
 "following dependencies:"
-msgstr "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:"
+msgstr ""
+"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:390
+#: src/reason_fragment.cc:390
 msgid "%B%s%b is currently installed."
 msgstr "%B%s%b cÃ³ cÃ i hiá»‡n thá»i."
 
-#:src/reason_fragment.cc:396
+#: src/reason_fragment.cc:396
 msgid "%B%s%b is not currently installed."
 msgstr "%B%s%b chÆ°a cÃ i hiá»‡n thá»i."
 
-#:src/reason_fragment.cc:404
+#: src/reason_fragment.cc:404
 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:408
+#: src/reason_fragment.cc:408
 msgid "%B%s%b will be downgraded."
 msgstr "Sáº½ háº¡ cáº¥p %B%s%b."
 
-#:src/reason_fragment.cc:415
+#: src/reason_fragment.cc:415
 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:419
+#: src/reason_fragment.cc:419
 msgid ""
 "%B%s%b could be upgraded to version %B%s%b, but it is being held at version %"
 "B%s%b."
-msgstr "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."
+msgstr ""
+"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:426
+#: src/reason_fragment.cc:426
 msgid "%B%s%b will be re-installed."
 msgstr "Sáº½ cÃ i láº¡i %B%s%b."
 
-#:src/reason_fragment.cc:430
+#: src/reason_fragment.cc:430
 msgid "%B%s%b will be installed."
 msgstr "Sáº½ cÃ i %B%s%b."
 
-#:src/reason_fragment.cc:434
+#: src/reason_fragment.cc:434
 msgid "%B%s%b will be removed."
 msgstr "Sáº½ loáº¡i bá» %B%s%b."
 
-#:src/reason_fragment.cc:439
+#: src/reason_fragment.cc:439
 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:475
+#: src/reason_fragment.cc:475
 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á»:"
+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:478
+#: src/reason_fragment.cc:478
 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:485
+#: src/reason_fragment.cc:485
 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:518
+#: src/reason_fragment.cc:518
 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 "
 "installed version:"
-msgstr "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."
+msgstr ""
+"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:522
+#: src/reason_fragment.cc:522
 msgid ""
 "The following packages conflict with %B%s%b, or depend on a version of it "
 "which is not going to be installed."
-msgstr "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."
+msgstr ""
+"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:526
+#: src/reason_fragment.cc:526
 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:531
+#: src/reason_fragment.cc:531
 msgid ""
 "The following packages depend on a version of %B%s%b other than the "
 "currently installed version of %B%s%b:"
-msgstr "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."
+msgstr ""
+"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:535
+#: src/reason_fragment.cc:535
 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."
+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:541
+#: src/reason_fragment.cc:541
 msgid "upgraded"
 msgstr "Ä‘Ã£ cáºp nháºt"
 
-#:src/reason_fragment.cc:541
+#: src/reason_fragment.cc:541
 msgid "downgraded"
 msgstr "bá»‹ háº¡ cáº¥p"
 
-#:src/reason_fragment.cc:547
+#: src/reason_fragment.cc:547
 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 "
 "broken if it is %s."
-msgstr "Nhá»¯ng gÃ³i theo Ä‘Ã¢y phá»¥ thuá»™c vÃ o phiÃªn báº£n %B%s%b hiá»‡n cÃ³ cÃ i (%B%s%b), hoáº·c 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áº¿."
+msgstr ""
+"Nhá»¯ng gÃ³i theo Ä‘Ã¢y phá»¥ thuá»™c vÃ o phiÃªn báº£n %B%s%b hiá»‡n cÃ³ cÃ i (%B%s%b), hoáº·c "
+"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:554
+#: src/reason_fragment.cc:554
 msgid ""
 "The following packages conflict with version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
-msgstr "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."
+msgstr ""
+"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:559
+#: src/reason_fragment.cc:559
 msgid ""
 "The following packages depend on version %B%s%b of %B%s%b, and will be "
 "broken if it is %s."
-msgstr "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Ã³ Ä‘Æ°á»£c %s."
+msgstr ""
+"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Ã³ Ä‘Æ°á»£c %s."
+
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+#, fuzzy
+msgid "No packages are broken."
+msgstr "Má»™t sá»‘ gÃ³i bá»‹ ngáº¯t. Cá»‘ sá»a chÃºng khÃ´ng?"
+
+#: src/solution_dialog.cc:103
+msgid "No resolution found."
+msgstr ""
+
+#: 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)."
+msgstr ""
+
+#: src/solution_dialog.cc:146
+#, fuzzy
+msgid "Previous"
+msgstr "Cung cáº¥p"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Káº¿"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^ÄÃ³ng"
 
-#:src/trust.cc:21 src/trust.cc:23
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Theo Ä‘Ã¢y cÃ³ nhá»¯ng gÃ³i bá»‹ NGáº®T:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Theo Ä‘Ã¢y cÃ³ nhá»¯ng gÃ³i bá»‹ NGáº®T:"
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+#, fuzzy
+msgid "%BUpgrade%b the following packages:%n"
+msgstr "Theo Ä‘Ã¢y cÃ³ nhá»¯ng gÃ³i bá»‹ NGáº®T:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "TÃ i vá» gÃ³i..."
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
+#: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr "Cáº¢NH BÃO"
 
-#:src/trust.cc:22
+#: 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 "
 "system."
-msgstr "%F: PhiÃªn báº£n %s nÃ y thuá»™c vá» má»™t %Bnguá»“n khÃ´ng Ä‘Ã¡ng tin%b. NhÆ° tháº¿ thÃ¬ cÃ i 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."
+msgstr ""
+"%F: PhiÃªn báº£n %s nÃ y thuá»™c vá» má»™t %Bnguá»“n khÃ´ng Ä‘Ã¡ng tin%b. NhÆ° tháº¿ thÃ¬ cÃ i "
+"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:145
+#: 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:200
+#: src/ui.cc:171
+msgid "E:"
+msgstr ""
+
+#: src/ui.cc:173
+msgid "W:"
+msgstr ""
+
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "TÃ¬m:L"
 
-#:src/ui.cc:255
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "Báº¡n cÃ³ Ä‘Äƒng nháºp nhÆ° lÃ  ngÆ°á»i chá»§ rá»“i."
 
-#:src/ui.cc:353
+#: src/ui.cc:360
 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:381
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "Táº£i bá»™ nhá»› táº¡m..."
 
-#:src/ui.cc:403
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "Tháºt sá»± thoÃ¡t trÃ¬nh Aptitude khÃ´ng?"
 
-#:src/ui.cc:482
+#: src/ui.cc:489
 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?"
+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:582
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "GÃ³i"
 
-#:src/ui.cc:583 src/ui.cc:610
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "Xem cÃ¡c gÃ³i cÃ´ng bá»‘ vÃ  chá»n thá»±c hiá»‡n hÃ nh Ä‘á»™ng"
 
-#:src/ui.cc:651
-#,c-format
+#: src/ui.cc:667
+#, fuzzy
 msgid ""
-"Aptitude %s\n"
-"\n"
-"Copyright 2000 Daniel Burrows.\n"
-"\n"
-"aptitude comes with ABSOLUTELY NO WARRANTY; for details see 'license' in "
-"the\n"
-"Help menu.  This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; see 'license' for details."
+"%AAptitude %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"
 "\n"
 "Báº£n quyá»n Â© 2000 Daniel Burrows.\n"
 "\n"
-"aptitude khÃ´ng cÃ³ báº£o Ä‘áº£m gÃ¬ cáº£: Ä‘á»ƒ tÃ¬m chi tiáº¿t thÃ¬ hÃ£y xem lá»‡nh Â«Báº£n quyá»nÂ» trong trÃ¬nh 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."
+"aptitude khÃ´ng cÃ³ báº£o Ä‘áº£m gÃ¬ cáº£: Ä‘á»ƒ tÃ¬m chi tiáº¿t thÃ¬ hÃ£y xem lá»‡nh Â«Báº£n "
+"quyá»nÂ» trong trÃ¬nh 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:672
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#:src/ui.cc:688
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#:src/ui.cc:893
+#: src/ui.cc:786
+#, fuzzy
 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 ""
-"%BCáº¢NH BÃO%b: sáº½ cÃ i phiÃªn báº£n khÃ´ng Ä‘Ã¡ng tin cá»§a nhá»¯ng gÃ³i theo Ä‘Ã¢y.%"
-"n%nGÃ³i 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"
+"%C%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 ""
+"%BCáº¢NH BÃO%b: sáº½ cÃ i phiÃªn báº£n khÃ´ng Ä‘Ã¡ng tin cá»§a nhá»¯ng gÃ³i theo Ä‘Ã¢y.%n%nGÃ³i "
+"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:905
+#: src/ui.cc:800
 msgid "Really Continue"
 msgstr "Tháºt tiáº¿p tá»¥c"
 
-#:src/ui.cc:907
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr "Há»§y bá» cÃ i"
 
-#:src/ui.cc:970
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "Xem trÆ°á»›c cÃ¡ch cÃ i gÃ³i"
 
-#:src/ui.cc:971
+#: src/ui.cc:864
 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:1011
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:865
+#, fuzzy
+msgid "Preview"
+msgstr "^TrÆ°á»›c"
+
+#: src/ui.cc:901
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "Má»™t sá»‘ gÃ³i bá»‹ ngáº¯t thÃ¬ Ä‘Ã£ sá»a chÃºng rá»“i. :)"
 
-#:src/ui.cc:1013
-msgid "Some broken packages could not be fixed!"
-msgstr "KhÃ´ng thá»ƒ sá»a má»™t sá»‘ gÃ³i ná»‹ ngáº¯t. :("
+#: src/ui.cc:907
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#:src/ui.cc:1021 src/ui.cc:1141
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "Má»™t sá»‘ gÃ³i bá»‹ ngáº¯t. Cá»‘ sá»a chÃºng khÃ´ng?"
+#: src/ui.cc:913
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#:src/ui.cc:1038
+#: src/ui.cc:959
+#, fuzzy
 msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have.  Would you like to change to the root account?\n"
-msgstr "CÃ i / loai bá» gÃ³i cáº§n thiáº¿t quyá»n quáº£n trá»‹ mÃ  báº¡n hiá»‡n thá»i khÃ´ng cÃ³.\n"
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have.  Would you like to change to the root account?"
+msgstr ""
+"CÃ i / loai bá» gÃ³i cáº§n thiáº¿t quyá»n quáº£n trá»‹ mÃ  báº¡n hiá»‡n thá»i khÃ´ng cÃ³.\n"
 "Báº¡n cÃ³ muá»‘n chuyá»ƒn Ä‘á»•i sang tÃ i khoáº£n ngÆ°Æ¡i chá»§ khÃ´ng?\n"
 
-#:src/ui.cc:1041 src/ui.cc:1175
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "Trá» thÃ nh ngÆ°á»i chá»§"
 
-#:src/ui.cc:1047 src/ui.cc:1177
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "Äá»«ng trá»Ÿ thÃ nh ngÆ°á»i chá»§"
 
-#:src/ui.cc:1052 src/ui.cc:1182
+#: src/ui.cc:969 src/ui.cc:1085
 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:1079
+#: src/ui.cc:996
 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:1085
+#: src/ui.cc:1002
+#, fuzzy
 msgid ""
-"No packages will be installed, removed or upgraded.\n"
-"\n"
-"Some packages could be upgraded, but you have not chosen to upgrade them.\n"
-"Type \"U\" to prepare an upgrade."
-msgstr "Sáº½ khÃ´ng cÃ i, loáº¡i bá» hay cáºp nháºt gÃ³i nÃ o.\n"
+"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 ""
+"Sáº½ khÃ´ng cÃ i, loáº¡i bá» hay cáºp nháºt gÃ³i nÃ o.\n"
 "\n"
 "CÃ³ thá»ƒ cáºp nháºt má»™t sá»‘ gÃ³i, nhÆ°ng mÃ  báº¡n chÆ°a chá»n cáºp nháºt chÃºng.\n"
 "HÃ£y phÃm U Ä‘á»ƒ chuáº©n bá»‹ cáºp nháºt."
 
-#:src/ui.cc:1172
+#: src/ui.cc:1074
+#, fuzzy
 msgid ""
-"Updating the package lists requires administrative privileges, which\n"
-"you currently do not have.  Would you like to change to the root account?\n"
-msgstr "Cáºp nháºt danh sÃ¡ch gÃ³i thi cáº§n thiáº¿t quyá»n 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á»§ khÃ´ng?\n"
+"Updating the package lists requires administrative privileges, which you "
+"currently do not have.  Would you like to change to the root account?"
+msgstr ""
+"Cáºp nháºt danh sÃ¡ch gÃ³i thi cáº§n thiáº¿t quyá»n 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á»§ khÃ´ng?\n"
 
-#:src/ui.cc:1187 src/ui.cc:1358
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "Máºt thá»i gian khi cá»‘ tÃ¬m mÃ¬n."
 
-#:src/ui.cc:1194 src/ui.cc:1235
+#: src/ui.cc:1097 src/ui.cc:1150
 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:1197
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "XÃ³a bá» táºp tin Ä‘Ã£ táº£i vá»..."
 
-#:src/ui.cc:1211
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "Má»›i xÃ³a bá» nhá»¯ng táºp tin gÃ³i Ä‘Ã£ táº£i vá» rá»“i."
 
-#:src/ui.cc:1252
-msgid "Obsolete downloaded package files have been deleted"
+#: src/ui.cc:1175
+#, fuzzy, c-format
+msgid ""
+"Obsolete downloaded package files have been deleted, freeing %sB of disk "
+"space."
 msgstr "Má»›i xÃ³a bá» nhá»¯ng táºp tin gÃ³i cÅ© Ä‘Ã£ táº£i vá» rá»“i."
 
-#:src/ui.cc:1334
+#: src/ui.cc:1247
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1252 src/ui.cc:1283
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Máºt thá»i gian khi cá»‘ tÃ¬m mÃ¬n."
+
+#: src/ui.cc:1277
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "KhÃ´ng thá»ƒ má»Ÿ %s Ä‘á»ƒ ghi."
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "^CÃ i / loáº¡i bá» gÃ³i"
 
-#:src/ui.cc:1335
+#: src/ui.cc:1354
 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:1337
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "^Cáºp nháºt danh sÃ¡ch gÃ³i"
 
-#:src/ui.cc:1338
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "Kiá»ƒm tra cÃ³ phiÃªn báº£n gÃ³i má»›i"
 
-#:src/ui.cc:1341
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "^QuÃªn cÃ¡c gÃ³i má»›i"
 
-#:src/ui.cc:1342
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "QuÃªn gÃ³i nÃ o lÃ  Â«Má»›iÂ»"
 
-#:src/ui.cc:1345
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "^XÃ³a bá»™ nhá»› táº¡m gÃ³i"
 
-#:src/ui.cc:1346
+#: src/ui.cc:1365
 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:1349
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "XÃ³a táºp tin ^cÅ©"
 
-#:src/ui.cc:1350
+#: src/ui.cc:1369
 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:1353
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "NhÃ£n ^co thá»ƒ cáºp nháºt"
 
-#:src/ui.cc:1354
+#: src/ui.cc:1373
 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:1357
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "^ChÆ¡i QuÃ©t mÃ¬n"
 
-#:src/ui.cc:1360
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "^Trá»Ÿ thÃ nh ngÆ°á»i chá»§"
 
-#:src/ui.cc:1361
+#: src/ui.cc:1380
+#, fuzzy
 msgid ""
-"Run 'su' to become root; this will restart the program, but your\n"
-"settings will be preserved"
-msgstr "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."
+"Run 'su' to become root; this will restart the program, but your settings "
+"will be preserved"
+msgstr ""
+"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:1364
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "^Táº£i láº¡i bá»™ nhá»› táº¡m gÃ³i"
 
-#:src/ui.cc:1365
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "Táº£i láº¡i bá»™ nhá»› táº¡m gÃ³i"
 
-#:src/ui.cc:1371
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "^ThoÃ¡t"
 
-#:src/ui.cc:1372
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "ThoÃ¡t khá»i chÆ°Æ¡ng trÃ¬nh"
 
-#:src/ui.cc:1378 src/ui.cc:1642
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "Há»“i láº¡i"
 
-#:src/ui.cc:1379
+#: src/ui.cc:1398
 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:1386
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "^CÃ i"
 
-#:src/ui.cc:1387
+#: src/ui.cc:1406
 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:1390
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "^Bá»"
 
-#:src/ui.cc:1391
+#: src/ui.cc:1410
 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:1394
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "^Táº©y"
 
-#:src/ui.cc:1395
+#: src/ui.cc:1414
 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:1398
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "^Giá»¯"
 
-#:src/ui.cc:1399
+#: src/ui.cc:1418
 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:1402
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "^Giá»¯ láº¡i"
 
-#:src/ui.cc:1403
+#: src/ui.cc:1422
 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."
+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:1406
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "NhÃ£n ^Tá»± Ä‘á»™ng"
 
-#:src/ui.cc:1407
+#: src/ui.cc:1426
+#, fuzzy
 msgid ""
-"Mark the selected package as having been automatically installed;\n"
-"it will automatically be removed if no other packages depend on it"
-msgstr "ÄÃ¡nh dáº¥u gÃ³i Ä‘Ã£ chá»n nhÆ° lÃ  Ä‘Ã£ cÃ i tá»± Ä‘á»™ng;\n"
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
+msgstr ""
+"ÄÃ¡nh dáº¥u gÃ³i Ä‘Ã£ chá»n nhÆ° lÃ  Ä‘Ã£ cÃ i tá»± Ä‘á»™ng;\n"
 "nÃ³ sáº½ bi loáº¡i bá» tá»± Ä‘á»™ng náº¿u khÃ´ng cÃ³ gÃ³i khÃ¡c phá»¥ thuá»™c vÃ o nÃ³."
 
-#:src/ui.cc:1410
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "NhÃ£n ^Thá»§ cÃ´ng"
 
-#:src/ui.cc:1411
+#: src/ui.cc:1430
+#, fuzzy
 msgid ""
-"Mark the selected package as having been manually installed;\n"
-"it will not be removed unless you manually remove it"
-msgstr "ÄÃ¡nh dáº¥u gÃ³i Ä‘Ã£ chá»n nhÆ° lÃ  Ä‘Ã£ cÃ i thá»§ cÃ´ng;\n"
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
+msgstr ""
+"ÄÃ¡nh dáº¥u gÃ³i Ä‘Ã£ chá»n nhÆ° lÃ  Ä‘Ã£ cÃ i thá»§ cÃ´ng;\n"
 "sáº½ khÃ´ng loáº¡i bá» nÃ³ trá»« khi báº¡n tá»± loáº¡i bá» nÃ³."
 
-#:src/ui.cc:1414
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "^Cáº¥m phiÃªn báº£n"
 
-#:src/ui.cc:1415
+#: src/ui.cc:1434
+#, fuzzy
 msgid ""
-"Forbid the candidate version of the selected package from being installed;\n"
+"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;\n"
+msgstr ""
+"Cáº¥m cÃ i phiÃªn báº£n á»©ng cá» cá»§a gÃ³i Ä‘Ã£ chá»n;\n"
 "sáº½ tiáº¿p tá»¥c cÃ i phiÃªn báº£n má»›i hÆ¡n."
 
-#:src/ui.cc:1419
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "ThÃ´ng ti^n"
 
-#:src/ui.cc:1420
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "Hiá»ƒn thá»‹ thÃ´ng tin thÃªm vá» gÃ³i Ä‘Ã£ chá»n."
 
-#:src/ui.cc:1423
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "Báº£n ghi ^Ä‘á»•i"
 
-#:src/ui.cc:1424
+#: src/ui.cc:1443
 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:1431
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "^TÃ¬m"
 
-#:src/ui.cc:1432
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "TÃ¬m gÃ³i."
 
-#:src/ui.cc:1434
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "TÃ¬m ^láº¡i"
 
-#:src/ui.cc:1435
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "TÃ¬m láº¡i chuá»—i má»›i tÃ¬m"
 
-#:src/ui.cc:1438
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "^Háº¡n hiá»ƒn thá»‹"
 
-#:src/ui.cc:1439
+#: src/ui.cc:1460
 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:1441
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "^Bá» háº¡n hiá»ƒn thá»‹"
 
-#:src/ui.cc:1442
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "Loáº¡i bá» bá»™ lá»c ra danh sÃ¡ch gÃ³i."
 
-#:src/ui.cc:1445
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "TÃ¬m bá»‹ ^ngáº¯t"
 
-#:src/ui.cc:1446
+#: src/ui.cc:1469
 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:1452
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "TÃ¹y chá»n _giao diá»‡n ngÆ°á»i dÃ¹ng"
 
-#:src/ui.cc:1453
+#: src/ui.cc:1477
 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:1456
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "^Quáº£n lÃ½ cÃ¡ch phá»¥ thuá»™c"
 
-#:src/ui.cc:1457
+#: src/ui.cc:1481
 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:1460
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "^Linh tinh"
 
-#:src/ui.cc:1461
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "Thay Ä‘á»•i thiáº¿t láºp chÆ°Æ¡ng trÃ¬nh linh tinh."
 
-#:src/ui.cc:1466
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "^Trá»Ÿ vá» tÃ¹y chá»n"
 
-#:src/ui.cc:1467
+#: src/ui.cc:1491
 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:1478
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "^Káº¿"
 
-#:src/ui.cc:1479
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "Xem bá»™ trÃ¬nh bÃ y káº¿ tiáº¿p"
 
-#:src/ui.cc:1482
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "^TrÆ°á»›c"
 
-#:src/ui.cc:1483
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "Xem bá»™ trÃ¬nh bÃ y trÆ°á»›c"
 
-#:src/ui.cc:1486
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "^ÄÃ³ng"
 
-#:src/ui.cc:1487
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "ÄÃ³ng bá»™ trÃ¬nh bÃ y nÃ y."
 
-#:src/ui.cc:1492
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "Khung ^xem gÃ³i má»›i"
 
-#:src/ui.cc:1493
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "Táº¡o má»™t khung xem gÃ³i máº·c Ä‘á»‹nh má»›i."
 
-#:src/ui.cc:1496
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "Bá»™ ^duyá»‡t phÃ¢n loáº¡i má»›i"
 
-#:src/ui.cc:1498
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "Duyá»‡t cÃ¡c gÃ³i theo loáº¡i."
 
-#:src/ui.cc:1506
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "^Giá»›i thiá»‡u"
 
-#:src/ui.cc:1507
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "Xem thÃ´ng tin vá» chÆ°Æ¡ng trÃ¬nh nÃ y."
 
-#:src/ui.cc:1510
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "^Trá»£ giÃºp"
 
-#:src/ui.cc:1511
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "Xem trá»£ giÃºp trá»±c tuyáº¿n."
 
-#:src/ui.cc:1513
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "^Sá»• hÆ°á»›ng dáº«n ngÆ°á»i dÃ¹ng"
 
-#:src/ui.cc:1514
+#: src/ui.cc:1538
 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:1517
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "^Há»i Ä‘Ã¡p"
 
-#:src/ui.cc:1518
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "Xem danh sÃ¡ch cÃ¢u há»i Ä‘Ã£ há»i nhiá»u láº§n."
 
-#:src/ui.cc:1521
-msgid "^ChangeLog"
-msgstr "^Báº£n ghi Ä‘á»•i"
+#: src/ui.cc:1545
+msgid "^NEWS"
+msgstr ""
 
-#:src/ui.cc:1522
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1546
+#, fuzzy
+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 chÆ°Æ¡ng trÃ¬nh má»›i."
 
-#:src/ui.cc:1525
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "^Báº£n quyá»n"
 
-#:src/ui.cc:1526
+#: src/ui.cc:1550
 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:1641
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "HÃ nh Ä‘á»™ng"
 
-#:src/ui.cc:1644
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "TÃ¬m"
 
-#:src/ui.cc:1645
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "TÃ¹y chá»n"
 
-#:src/ui.cc:1646
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "Xem"
 
-#:src/ui.cc:1647
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "Trá»£ giÃºp"
 
-#:src/ui.cc:1692
-#,c-format
+#: src/ui.cc:1734
+#, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
-"%s: TrÃ¬nh Ä‘Æ¡n  %s: Trá»£ giÃºp  %s: ThoÃ¡t  %s: Cáºp nháºt  %s: Táº£i vá»/CÃ i/Loáº¡i bá» GÃ³i"
+"%s: TrÃ¬nh Ä‘Æ¡n  %s: Trá»£ giÃºp  %s: ThoÃ¡t  %s: Cáºp nháºt  %s: Táº£i vá»/CÃ i/Loáº¡i bá» "
+"GÃ³i"
 
-#:src/ui.cc:1954 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#:src/ui.cc:1955 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
-#:src/view_changelog.cc:46
+#: src/view_changelog.cc:46
 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."
+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:52
+#: src/view_changelog.cc:52
 msgid "Downloading Changelog"
 msgstr "Táº£i vá» Báº£n ghi Ä‘á»•i..."
 
-#:src/vscreen/vscreen.cc:119
-#,c-format
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Táº£i vá» Báº£n ghi Ä‘á»•i..."
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
+#: src/vscreen/vscreen.cc:119
+#, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
 msgstr "Ã”i! Gáº·p SIGTERM thÃ¬ Ä‘ang cháº¿t...\n"
 
-#:src/vscreen/vscreen.cc:122
-#,c-format
+#: src/vscreen/vscreen.cc:122
+#, c-format
 msgid "Ouch!  Got SIGSEGV, dying..\n"
 msgstr "Ã”i! Gáº·p SIGSEGV thÃ¬ Ä‘ang cháº¿t...\n"
 
-#:src/vscreen/vscreen.cc:125
-#,c-format
+#: src/vscreen/vscreen.cc:125
+#, c-format
 msgid "Ouch!  Got SIGABRT, dying..\n"
 msgstr "Ã”i! Gáº·p SIGABRT thÃ¬ Ä‘ang cháº¿t...\n"
 
-#:src/vscreen/vscreen.cc:128
-#,c-format
+#: src/vscreen/vscreen.cc:128
+#, c-format
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "Ã”i! Gáº·p SIGQUIT thÃ¬ Ä‘ang cháº¿t...\n"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "Lá»‡nh cÃ³ thá»ƒ dÃ¹ng:\n"
+#~ "  y: tiáº¿p tá»¥c cÃ i (_CÃ³_)\n"
+#~ "  n: há»§y bá» rá»“i thoÃ¡t (_khÃ´ng_)\n"
+#~ "  i: hiá»ƒn thá»‹ _thÃ´ng tin_ vá» má»™t hay nhiá»u gÃ³i tin;\n"
+#~ "     cÃ¡c tÃªn gÃ³i nÃªn theo 'i'\n"
+#~ "  c: hiá»ƒn thá»‹ báº£n ghi _thay Ä‘á»•i_ cá»§a má»™t hay nhiá»u gÃ³i tin;\n"
+#~ "     cÃ¡c tÃªn gÃ³i nÃªn theo 'c'\n"
+#~ "  d: báºt táº¯t hiá»ƒn thá»‹ thÃ´ng tin vá» cÃ¡ch _phá»¥ thuá»™c_\n"
+#~ "  s: báºt táº¯t hiá»ƒn thá»‹ thÃ´ng tin vá» cÃ¡ch thay Ä‘á»•i _cá»¡_ gÃ³i tin\n"
+#~ "  v: báºt táº¯t hiá»ƒn thá»‹ sá»‘ _phiÃªn báº£n_\n"
+#~ "  e: _vÃ o_ giao diá»‡n trá»±c quan toÃ n bá»™\n"
+#~ "\n"
+#~ "Báº¡n cÅ©ng cÃ³ láº½ ghi rÃµ cÃ¡ch sá»a Ä‘á»•i nhÃ³m hÃ nh Ä‘á»™ng vá» gÃ³i tin.\n"
+#~ "Äá»ƒ lÃ m nhÆ° tháº¿, hÃ£y gÃµ má»™t chá»¯ hÃ nh Ä‘á»™ng (nhÆ° bÃªn dÆ°á»›i)\n"
+#~ "vá»›i má»™t hay nhiá»u tÃªn gÃ³i hay máº«u theo sau.\n"
+#~ "HÃ nh Ä‘á»™ng áº¥y sáº½ Ã¡p dá»¥ng vÃ o má»i gÃ³i trong nhá»¯ng gÃ³i áº¥y.\n"
+#~ "Báº¡n cÃ³ thá»ƒ ghi rÃµ nhá»¯ng hÃ nh Ä‘á»™ng thÃªm:\n"
+#~ "má»—i hÃ nh Ä‘á»™ng thÃªm sáº½ Ã¡p dá»¥ng vÃ o má»i gÃ³i tin theo sau nÃ³.\n"
+#~ "  \n"
+#~ "HÃ nh Ä‘á»™ng:\n"
+#~ "  + : CÃ i\n"
+#~ "  - : Loáº¡i bá»\n"
+#~ "  _ : Táº©y\n"
+#~ "  = : Giá»¯ láº¡i\n"
+
+#~ msgid ""
+#~ "Some packages had unmet dependencies.  This may mean that you have\n"
+#~ "requested an impossible situation or if you are using the unstable\n"
+#~ "distribution that some required packages have not yet been created\n"
+#~ "or been moved out of Incoming.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Má»™t sá»‘ gÃ³i phá»¥ thuá»™c vÃ o pháº§n má»m chÆ°a cÃ i. CÃ³ láº½ cÃ³ nghÄ©a lÃ  báº¡n Ä‘Ã£ yÃªu "
+#~ "cáº§u trÆ°Æ¡ng há»£p khÃ´ng thá»ƒ, hoáº·c náº¿u báº¡n Ä‘ang sá» dá»¥ng sá»± phÃ¢n phÃ¡t báº¥t Ä‘á»‹nh "
+#~ "thÃ¬ chÆ°a cÃ³ táº¡o má»™t sá»‘ gÃ³i cáº§n thiáº¿t, hoáº·c chÆ°a di Ä‘á»™ng chÃºng ra Incoming "
+#~ "(Äáº¿n vÃ o).\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HÃ£y náº¡p Ä‘Ä©a nÃ y vÃ o á»• \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "TÃ¹y chá»n khÃ´ng há»£p lÃª cho cháº¿ Ä‘á»™ tÆ°Æ¡ng tÃ¡c: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "ThÃ´ng tin vá»     "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "KhÃ´ng thá»ƒ sá»a má»™t sá»‘ gÃ³i ná»‹ ngáº¯t. :("
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Báº£n ghi Ä‘á»•i"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-10-11 09:15+0200\n"
 "Last-Translator: Yongtao Yang <yongtao.yang at telia.com>\n"
 "Language-Team: zh_CN <i18n-translation at lists.linux.net.cn>\n"
@@ -148,7 +148,7 @@
 msgstr "è‡ªåŠ¨å¸è½½åŒ¹é…è¯¥è¿‡æ»¤å™¨çš„æœªç”¨è½¯ä»¶åŒ…"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "ç¡®å®š"
@@ -289,47 +289,47 @@
 "      virtual package \"%s\"\n"
 msgstr "æ³¨æ„ï¼šé€‰æ‹© â€œ%sâ€è€Œä¸æ˜¯è™šæ‹Ÿè½¯ä»¶åŒ… â€œ%sâ€\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s çš„ (%s) ç‰ˆæœ¬å·²ç»æŒ‰è¦æ±‚å®‰è£…äº†\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s ç›®å‰æœªè¢«å®‰è£…ï¼Œæ‰€ä»¥å®ƒä¸ä¼šè¢«é‡æ–°å®‰è£…ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "è½¯ä»¶åŒ… %s å¹¶æœªå®‰è£…ï¼Œæ‰€ä»¥ä¸åˆ é™¤\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "è½¯ä»¶åŒ… %s å¹¶æœªå®‰è£…ï¼Œä¸èƒ½ç¦æ¢å‡çº§\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "è½¯ä»¶åŒ… %s æ˜¯ä¸å¯å‡çº§çš„ï¼Œä¸èƒ½è®¾ä¸ºç¦æ¢å‡çº§\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "æ³¨æ„ï¼šé€‰æ‹©ä»»åŠ¡ â€œ%sï¼š%sâ€å®‰è£…\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "åœ¨â€œå®‰è£…â€å‘½ä»¤ä¸æ‚¨åªèƒ½æŒ‡å®šä¸€ä¸ªè½¯ä»¶åŒ…çš„å˜æ¡£\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "åœ¨â€œå®‰è£…â€å‘½ä»¤ä¸æ‚¨åªèƒ½æŒ‡å®šä¸€ä¸ªè½¯ä»¶åŒ…çš„å˜æ¡£\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -338,7 +338,7 @@
 "æ— æ³•æ‰¾åˆ°è½¯ä»¶åŒ…â€œ%sâ€ï¼ŒåŒæ—¶æœ‰è¶…è¿‡40ä¸ªè½¯ä»¶åŒ…åç§°\n"
 "ä¸åŒ…å«â€œ%sâ€ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -347,12 +347,12 @@
 "æ— æ³•æ‰¾åˆ°è½¯ä»¶åŒ…â€œ%sâ€ã€‚ç„¶è€Œä¸‹åˆ—è½¯ä»¶åŒ…åç§°ä¸\n"
 "åŒ…å«â€œ%sâ€ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "æ— æ³•æ‰¾åˆ°ä»»ä½•åç§°æˆ–è€…æè¿°ä¸åŒ¹é…â€œ%sâ€çš„è½¯ä»¶åŒ…\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -361,7 +361,7 @@
 "æ— æ³•æ‰¾åˆ°ä»»ä½•è½¯ä»¶åŒ…åŒ¹é…â€œ%sâ€ï¼ŒåŒæ—¶æœ‰è¶…è¿‡40ä¸ªè½¯ä»¶åŒ…\n"
 "å…¶æè¿°ä¸åŒ…å«â€œ%sâ€ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -370,6 +370,11 @@
 "æ— æ³•æ‰¾åˆ°ä»»ä½•è½¯ä»¶åŒ…åŒ¹é…â€œ%sâ€ã€‚ç„¶è€Œä¸‹åˆ—è½¯ä»¶åŒ…çš„æè¿°ä¸\n"
 "åŒ…å«â€œ%sâ€ï¼š\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "éžæ³•çš„åŠ¨ä½œå—ç¬¦â€˜%câ€™\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "æ— æ³•æ‰§è¡Œ sensible-pagerï¼Œè¿™æ˜¯ä¸€ä¸ªæ£å¸¸è¿è¡Œçš„ Debain ç³»ç»Ÿå—ï¼Ÿ"
@@ -409,7 +414,7 @@
 msgid "Invalid operation %s"
 msgstr "æ— æ•ˆçš„æ“ä½œ %s"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -420,16 +425,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "ä¸‹è½½ï¼šæ‚¨å¿…é¡»æŒ‡å®šè‡³å°‘ä¸€ä¸ªè¦ä¸‹è½½çš„è½¯ä»¶åŒ…\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "æ— æ³•è¯»å–æºåˆ—è¡¨æ–‡ä»¶"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "æ— æ³•æ‰¾åˆ°åç§°ä¸ºâ€œ%sâ€çš„è½¯ä»¶åŒ…"
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -482,95 +487,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "è¿™æ˜¯ä»€ä¹ˆï¼Ÿ è¿™å½“ç„¶æ˜¯ä¸€åªå¤§è±¡è¢«ä¸€æ¡è›‡åžåƒäº†ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "æ— æ³•è¯»å–è½¯ä»¶åŒ…æºåˆ—è¡¨"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "ä½†æ˜¯ %s å°†è¢«å®‰è£…ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "ä½†æ˜¯ %s å·²è¢«å®‰è£…å¹¶ä¸”è¢«"
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ä½†æ˜¯ %s å·²å®‰è£…"
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "ä½†æ˜¯å®ƒä¸æ˜¯å¯å®‰è£…çš„"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " è¿™æ˜¯ä¸€ä¸ªè™šæ‹Ÿè½¯ä»¶åŒ…ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " æˆ–è€…"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æ˜¯â€œç ´æŸâ€çš„ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æœªè¢«ä½¿ç”¨ï¼Œå°†è¢«â€œåˆ é™¤â€ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å·²ç»è¢«è‡ªåŠ¨é˜»æ¢å‡çº§ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«è‡ªåŠ¨å®‰è£…ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«è‡ªåŠ¨â€œåˆ é™¤â€ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«â€œé™çº§â€ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å·²ç»è¢«é˜»æ¢å‡çº§ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«â€œé‡æ–°å®‰è£…â€ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "ä¸‹åˆ—â€œæ–°â€è½¯ä»¶åŒ…å°†è¢«å®‰è£…ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«â€œåˆ é™¤â€ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«å‡çº§ï¼š"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "ä¸‹åˆ—â€œåŸºæœ¬â€è½¯ä»¶åŒ…å°†è¢«â€œåˆ é™¤â€ï¼\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "è¯¥åŠ¨ä½œå°†ä½¿ä¸‹åˆ—â€œåŸºæœ¬â€è½¯ä»¶åŒ…â€œç ´æŸâ€ï¼š\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -579,99 +584,226 @@
 "è¦å‘Šï¼šæ‰§è¡Œè¯¥åŠ¨ä½œæœ‰å¯èƒ½å¯¼è‡´æ‚¨çš„ç³»ç»ŸæŸåï¼\n"
 "      â€œä¸è¦â€ç»§ç»ï¼Œé™¤éžæ‚¨â€œå®Œå…¨â€äº†è§£æ‚¨æ£åœ¨åšä»€ä¹ˆï¼\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "æˆ‘çŸ¥é“è¿™æ˜¯ä¸€ä¸ªéžå¸¸ç³Ÿç³•çš„ä¸»æ„"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "è¦ç»§ç»çš„è¯ï¼Œé”®å…¥è¯ç»„ â€œ%sâ€ï¼š\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "æ˜¯"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "å¦"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "è¦ç»§ç»çš„è¯ï¼Œé”®å…¥è¯ç»„ â€œ%sâ€ï¼š\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…è¢«â€œæŽ¨èâ€å®‰è£…ä½†æ˜¯å°†â€œä¸ä¼šâ€è¢«å®‰è£…ï¼š\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…è¢«â€œå»ºè®®â€å®‰è£…ä½†æ˜¯å°†â€œä¸ä¼šâ€è¢«å®‰è£…ï¼š\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "å°†ä¸ä¼šå®‰è£…ï¼Œå‡çº§æˆ–è€…åˆ é™¤ä»»ä½•è½¯ä»¶åŒ…ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu ä¸ªè½¯ä»¶åŒ…è¢«å‡çº§ï¼Œæ–°å®‰è£…%lu ä¸ªï¼Œ"
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ä¸ªé‡æ–°å®‰è£…ï¼Œ"
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu ä¸ªè¢«é™çº§ï¼Œ"
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu ä¸ªå°†è¢«åˆ é™¤ï¼Œ åŒæ—¶ %lu ä¸ªå°†ä¸å‡çº§ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "éœ€è¦èŽ·å– %sB/%sB çš„å˜æ¡£ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "éœ€è¦èŽ·å– %sB çš„å˜æ¡£ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "è§£åŒ…åŽå°†è¦ä½¿ç”¨ %sBã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "è§£åŒ…åŽå°†é‡Šæ”¾ %sBã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "éžæ³•çš„åŠ¨ä½œå—ç¬¦â€˜%câ€™\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "æ— å¯æ˜¾ç¤ºçš„è½¯ä»¶åŒ… -- è¯·åœ¨ â€˜iâ€™ ä¹‹åŽçš„é‚£ä¸€è¡Œè¾“å…¥è½¯ä»¶åŒ…åç§°ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "æŒ‰å›žè½¦ç»§ç»ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "æœªå‘çŽ°è½¯ä»¶åŒ… -- è¯·åœ¨ â€˜câ€™ ä¹‹åŽçš„é‚£ä¸€è¡Œè¾“å…¥è½¯ä»¶åŒ…åç§°ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "æŒ‰å›žè½¦ç»§ç»ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "æŸ¥çœ‹è½¯ä»¶åŒ…çš„æ˜¾ç¤ºæ ¼å¼"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "å®‰è£…/å¸è½½è½¯ä»¶åŒ…(^I)"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å°†è¢«è‡ªåŠ¨å®‰è£…ï¼š"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "å®‰è£…/å¸è½½è½¯ä»¶åŒ…(^I)"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "å¿˜è®°æ–°è½¯ä»¶åŒ…(^F)"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - å°†è½¯ä»¶åŒ…ç½®äºŽä¿æŒçŠ¶æ€\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - å°†è½¯ä»¶åŒ…æ ‡è®°ä¸ºè‡ªåŠ¨å®‰è£…\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - å°†è½¯ä»¶åŒ…æ ‡è®°ä¸ºæ‰‹åŠ¨å®‰è£…\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "æŽ¨è"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "æ‚¨è¦ç»§ç»å—ï¼Ÿ[Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -682,7 +814,7 @@
 "å°†æ˜¾ç¤ºä¾èµ–å…³ç³»ä¿¡æ¯ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -693,7 +825,7 @@
 "å°†ä¸æ˜¾ç¤ºä¾èµ–å…³ç³»ä¿¡æ¯ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -704,7 +836,7 @@
 "å°†ä¸æ˜¾ç¤ºä¾èµ–å…³ç³»ä¿¡æ¯ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -715,7 +847,7 @@
 "å°†ä¸æ˜¾ç¤ºç‰ˆæœ¬å·ã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -726,7 +858,7 @@
 "å°ºå¯¸å˜åŒ–å°†è¢«æ˜¾ç¤ºã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -737,127 +869,102 @@
 "å°ºå¯¸å˜åŒ–å°†ä¸è¢«æ˜¾ç¤ºã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"å‘½ä»¤ï¼š\n"
-"   yï¼šç»§ç»è¿›è¡Œå®‰è£…\n"
-"   nï¼šæ”¾å¼ƒå¹¶é€€å‡º\n"
-"   iï¼šæ˜¾ç¤ºä¸€ä¸ªæˆ–è€…å¤šä¸ªè½¯ä»¶åŒ…çš„ä¿¡æ¯\n"
-"      è½¯ä»¶åŒ…çš„åç§°åº”è¯¥åœ¨â€œiâ€ä¹‹åŽ \n"
-"   cï¼šæ˜¾ç¤ºä¸€ä¸ªæˆ–å¤šä¸ªè½¯ä»¶åŒ…çš„ Debian å˜æ›´æ—¥å¿—ï¼›\n"
-"      è½¯ä»¶åŒ…çš„åç§°åº”è¯¥åœ¨â€œcâ€ä¹‹åŽ\n"
-"   dï¼šåˆ‡æ¢æ˜¯å¦æ˜¾ç¤ºä¾èµ–å…³ç³»ä¿¡æ¯\n"
-"   sï¼šåˆ‡æ¢æ˜¯å¦æ˜¾ç¤ºè½¯ä»¶åŒ…å°ºå¯¸å˜åŒ–\n"
-"   vï¼šåˆ‡æ¢æ˜¯å¦æ˜¾ç¤ºç‰ˆæœ¬å·\n"
-"   eï¼šè¿›å…¥å…¨å›¾ç¤ºç•Œé¢\n"
-"\n"
-"   æ‚¨è¿˜å¯ä»¥æŒ‡å®šå¯¹è½¯ä»¶åŒ…åŠ¨ä½œé›†åˆè¿›è¡Œä¿®æ”¹ã€‚\n"
-"   è¦å®žçŽ°ä¸Šè¿°æ“ä½œï¼Œåœ¨åŠ¨ä½œå—ç¬¦ä¹‹åŽé”®å…¥ä¸€ä¸ªæˆ–å¤šä¸ªè½¯ä»¶åŒ…åç§°æˆ–è€…æ¨¡å¼ã€‚è¯¥åŠ¨ä½œå°†\n"
-"è¢«åº”ç”¨åˆ°å…¨éƒ¨è½¯ä»¶åŒ…ã€‚(æ‚¨å¯ä»¥æŒ‡å®šé™„åŠ çš„åŠ¨ä½œï¼›æ¯ä¸ªé™„åŠ åŠ¨ä½œå°†è¢«åº”ç”¨äºŽè·Ÿéšå…¶åŽçš„\n"
-"å…¨éƒ¨è½¯ä»¶åŒ…)\n"
-"\n"
-"åŠ¨ä½œï¼š\n"
-"  + ï¼šå®‰è£…\n"
-"  - ï¼šåˆ é™¤\n"
-"  _ : æ¸…é™¤\n"
-"  = : ä¿æŒ\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "éžæ³•å“åº”ã€‚è¯·è¾“å…¥ä¸€ä¸ªåˆæ³•å‘½ä»¤æˆ–è€…â€˜?â€™è¯·æ±‚å¸®åŠ©ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "é€€å‡ºæ¤ç¨‹åº"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å˜åœ¨æœªæ»¡è¶³çš„ä¾èµ–å…³ç³»ï¼š\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…æ˜¯â€œç ´æŸâ€çš„ï¼š"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "æ— æ³•æ‰“å¼€ %s ä»¥å†™å…¥"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "å†™å…¥çŠ¶æ€æ–‡ä»¶æ—¶å‘ç”Ÿé”™è¯¯"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "éžæ³•å“åº”ã€‚è¯·è¾“å…¥ä¸€ä¸ªåˆæ³•å‘½ä»¤æˆ–è€…â€˜?â€™è¯·æ±‚å¸®åŠ©ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "éžæ³•å“åº”ã€‚è¯·è¾“å…¥ä¸€ä¸ªåˆæ³•å‘½ä»¤æˆ–è€…â€˜?â€™è¯·æ±‚å¸®åŠ©ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "æŸ¥æ‰¾ï¼šæ‚¨å¿…é¡»æä¾›è‡³å°‘ä¸€ä¸ªæŸ¥æ‰¾é¡¹\n"
@@ -1152,7 +1259,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "æ— æ³•æ¸…ç©ºåˆ—è¡¨ç›®å½•"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "åˆ é™¤è¿‡æœŸçš„ä¸‹è½½æ–‡ä»¶"
 
@@ -1432,23 +1539,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "æ— æ³•ä¿®æ£ä¾èµ–å…³ç³»ï¼Œä¸€äº›åŒ…æ— æ³•å®‰è£…"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "æ— æ³•è¯»å–è½¯ä»¶æºåˆ—è¡¨ã€‚"
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "æ— æ³•è§£æžæˆ–æ‰“å¼€è½¯ä»¶åŒ…åˆ—è¡¨æ–‡ä»¶æˆ–çŠ¶æ€æ–‡ä»¶ã€‚"
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "æ‚¨å¯èƒ½éœ€è¦æ›´æ–°è½¯ä»¶åŒ…åˆ—è¡¨æ¥è§£å†³ç¼ºå°‘è¿™äº›æ–‡ä»¶çš„é—®é¢˜"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "æ— æ³•æ‰“å¼€ %s ä»¥å†™å…¥"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1713,17 +1815,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "æ— æ•ˆçš„æŽ’åºç–ç•¥ç±»åž‹â€œ%sâ€"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s ç¼–è¯‘äºŽ %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "ç¼–è¯‘å™¨ï¼šg++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1732,7 +1834,7 @@
 "\n"
 "NCurses ç‰ˆæœ¬ï¼š%s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1741,22 +1843,22 @@
 "\n"
 "Curses ç‰ˆæœ¬ï¼š%s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ ç‰ˆæœ¬ï¼š%s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "ç”¨æ³•ï¼š aptitude [-s æ–‡ä»¶å] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [é€‰é¡¹] <åŠ¨ä½œ> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1765,190 +1867,190 @@
 "  åŠ¨ä½œ (å¦‚æžœæœªæŒ‡å®šï¼Œaptitude å°†è¿›å…¥äº¤äº’æ¨¡å¼)ï¼š\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - å®‰è£…/å‡çº§è½¯ä»¶åŒ…\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - å¸è½½è½¯ä»¶åŒ…\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - å¸è½½è½¯ä»¶åŒ…å¹¶åˆ é™¤å…¶é…ç½®æ–‡ä»¶\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - å°†è½¯ä»¶åŒ…ç½®äºŽä¿æŒçŠ¶æ€\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - å–æ¶ˆå¯¹ä¸€ä¸ªè½¯ä»¶åŒ…çš„ä¿æŒå‘½ä»¤\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - å°†è½¯ä»¶åŒ…æ ‡è®°ä¸ºè‡ªåŠ¨å®‰è£…\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - å°†è½¯ä»¶åŒ…æ ‡è®°ä¸ºæ‰‹åŠ¨å®‰è£…\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " ç¦æ¢ç‰ˆæœ¬ - ç¦æ¢ aptitude å‡çº§åˆ°æŸä¸€ç‰¹å®šç‰ˆæœ¬çš„è½¯ä»¶åŒ…ã€‚\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - ä¸‹è½½æ–°/å¯å‡çº§è½¯ä»¶åŒ…åˆ—è¡¨\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - æ‰§è¡Œä¸€æ¬¡å®‰å…¨çš„å‡çº§\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr " dist-upgrade - æ‰§è¡Œå‡çº§ï¼Œå¯èƒ½ä¼šå®‰è£…å’Œå¸è½½è½¯ä»¶åŒ…\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - å¿˜è®°å“ªäº›è½¯ä»¶åŒ…æ˜¯â€œæ–°â€çš„\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - æŒ‰åç§° å’Œ/æˆ– è¡¨è¾¾å¼æœç´¢è½¯ä»¶åŒ…\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show       - æ˜¾ç¤ºä¸€ä¸ªè½¯ä»¶åŒ…çš„è¯¦ç»†ä¿¡æ¯\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - åˆ é™¤å·²ä¸‹è½½çš„è½¯ä»¶åŒ…æ–‡ä»¶\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - åˆ é™¤æ—§çš„å·²ä¸‹è½½è½¯ä»¶åŒ…æ–‡ä»¶\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - æŸ¥çœ‹ä¸€ä¸ªè½¯ä»¶åŒ…çš„å˜æ›´æ—¥å¿—\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - ä¸‹è½½è½¯ä»¶åŒ…çš„ .deb æ–‡ä»¶\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  é€‰é¡¹ï¼š\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             æ¤å¸®åŠ©æ–‡æœ¬\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             æ¨¡æ‹ŸåŠ¨ä½œï¼Œä½†æ˜¯å¹¶ä¸çœŸæ£æ‰§è¡Œã€‚\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             ä»…ä»…ä¸‹è½½è½¯ä»¶åŒ…ï¼Œä¸å®‰è£…æˆ–è€…å¸è½½ä»»ä½•ä¸œè¥¿ã€‚\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             æ€»æ˜¯æç¤ºç¡®è®¤æ‰§è¡ŒåŠ¨ä½œ\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             å‡è®¾å¯¹ç®€å•çš„ æ˜¯/å¦ é—®é¢˜å›žç”â€œæ˜¯â€\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr " -F æ ¼å¼        æŒ‡å®šæ˜¾ç¤ºæœç´¢ç»“æžœçš„æ ¼å¼ï¼›å‚è§æ‰‹å†Œ\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr " -O æ¬¡åº        æŒ‡å®šå¦‚ä½•æŽ’åˆ—æ˜¾ç¤ºæœç´¢ç»“æžœï¼›å‚è§æ‰‹å†Œ\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w å®½åº¦        æŒ‡å®šæ˜¾ç¤ºæœç´¢ç»“æžœçš„æ ¼å¼å®½åº¦\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             ç§¯æžåœ°å°è¯•ä¿®å¤æŸåçš„è½¯ä»¶åŒ…ã€‚\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             æ˜¾ç¤ºå°±è¦å®‰è£…çš„è½¯ä»¶åŒ…ç‰ˆæœ¬ã€‚\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             æ˜¾ç¤ºè‡ªåŠ¨æ”¹å˜çš„è½¯ä»¶åŒ…çš„ä¾èµ–å…³ç³»\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    æ˜¾ç¤ºæ¯ä¸ªè½¯ä»¶åŒ…çš„å®‰è£…å°ºå¯¸çš„å˜åŒ–ã€‚\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v             æ˜¾ç¤ºé™„åŠ ä¿¡æ¯ã€‚(å¯èƒ½ä¼šæä¾›å¤šæ¬¡) \n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [release]   è®¾ç½®å°†è¦å®‰è£…çš„è½¯ä»¶åŒ…çš„å‘å¸ƒç‰ˆæœ¬\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o key=val     ç›´æŽ¥è®¾ç½®åä¸ºâ€œkeyâ€çš„é…ç½®é€‰é¡¹\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1957,62 +2059,62 @@
 " --with(out)-recommends\tæŒ‡å®šæ˜¯å¦å°†æŽ¨è(å»ºè®®)å¤„ç†ä¸º\n"
 "              å¼ºä¾èµ–å…³ç³»ã€‚\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fname: ä»Žæ–‡ä»¶åä¸è¯»å–aptitudeçš„æ‰©å±•çŠ¶æ€ä¿¡æ¯ã€‚\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : å¼€å§‹è¿è¡Œæ—¶ä¸‹è½½æ–°çš„è½¯ä»¶åŒ…åˆ—è¡¨ã€‚\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : å¼€å§‹è¿è¡Œæ—¶æ‰§è¡Œå®‰è£…ã€‚\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  è¿™ä¸ª aptitude æ²¡æœ‰è¶…çº§ç‰›åŠ›ã€‚\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o è¦æ±‚å‚æ•°æ ¼å¼ä¸º key=valï¼ŒæŽ¥å—åˆ° %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "â€œè¯¡å¼‚â€ï¼šæ”¶åˆ°æœªçŸ¥çš„é€‰é¡¹ä»£ç \n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "é€‰é¡¹ -u å’Œ -i åªèƒ½æŒ‡å®šä¸€ä¸ª\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "é€‰é¡¹ -u å’Œ -i ä¸èƒ½åœ¨å‘½ä»¤è¡Œæ¨¡å¼ä¸æŒ‡å®š (ä¾‹å¦‚ï¼Œå’Œâ€œinstallâ€ä¸€èµ·)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "é€‰é¡¹ -u å’Œ -i ä¸èƒ½åœ¨å’Œä¸€ä¸ªå‘½ä»¤ä¸€èµ·æŒ‡å®š "
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "æœªçŸ¥çš„å‘½ä»¤â€œ%sâ€\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2043,7 +2145,7 @@
 msgid "Lost"
 msgstr "è¾“"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "æ‰«é›·"
 
@@ -2217,7 +2319,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "è½¯ä»¶åŒ…"
 
@@ -3600,52 +3702,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "æ©ï¼Œæ²¡æœ‰ä»»ä½•é”™è¯¯ï¼Œè¿™ä¸åº”è¯¥å‘ç”Ÿ.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "æœç´¢ï¼š"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "æ‚¨å·²ç»æ˜¯ root äº†ï¼"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "åè¿›ç¨‹è¿”å›žä¸€ä¸ªé”™è¯¯ -- æ‚¨è¾“å…¥çš„å¯†ç æ£ç¡®å—ï¼Ÿ"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "è½½å…¥ç¼“å˜"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "çœŸçš„è¦é€€å‡º Aptitude å—ï¼Ÿ"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "çœŸçš„è¦æ”¾å¼ƒæ‚¨çš„ä¸ªäººè®¾ç½®å¹¶è½½å…¥é»˜è®¤å€¼å—ï¼Ÿ"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "è½¯ä»¶åŒ…"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "æŸ¥çœ‹å¯é€‰è½¯ä»¶åŒ…ä»¥åŠé€‰æ‹©è¦æ‰§è¡Œçš„åŠ¨ä½œ"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3660,15 +3762,15 @@
 "ä½¿ç”¨ Aptitude è½¯ä»¶æ— ä»»ä½•æ‹…ä¿ï¼›ç»†èŠ‚è¯·æŸ¥é˜…å¸®åŠ©èœå•çš„ 'license' é¡¹ã€‚\n"
 "è¯¥è½¯ä»¶æ˜¯è‡ªç”±è½¯ä»¶ï¼Œæ¬¢è¿Žæ‚¨éµç…§æŸäº›æ¡æ¬¾åˆ†å‘è¯¥è½¯ä»¶ï¼›ç»†èŠ‚è¯·æŸ¥é˜… 'license' æ–‡ä»¶"
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help-zh_CN.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3676,45 +3778,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "ç»§ç»"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "é¢„è§ˆè½¯ä»¶åŒ…å®‰è£…"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "æŸ¥çœ‹ä»¥åŠ/æˆ–è€…è°ƒæ•´å°†è¦è¢«æ‰§è¡Œçš„åŠ¨ä½œ"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "ä¸Šä¸€ä¸ª(^P)"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "æŸäº›ç ´æŸçš„åŒ…å·²ç»è¢«ä¿®è¡¥ï¼"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3723,23 +3825,23 @@
 "å®‰è£…/åˆ é™¤è½¯ä»¶åŒ…éœ€è¦ç®¡ç†å‘˜æƒé™ï¼Œè€Œæ‚¨çŽ°åœ¨\n"
 "æ²¡æœ‰è¿™ç§æƒé™ã€‚æ‚¨æƒ³è¦è¿›å…¥ root å¸å·å—ï¼Ÿ\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "å˜æˆ root"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "ä¸å˜æˆ root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "å·²ç»å¼€å§‹äº†ä¸€ä¸ªè½¯ä»¶åŒ…åˆ—è¡¨æ›´æ–°æˆ–è€…å®‰è£…çš„åŠ¨ä½œã€‚"
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "æ²¡æœ‰ä»»ä½•è½¯ä»¶åŒ…è¢«è®¾å®šä¸ºå®‰è£…ï¼Œåˆ é™¤æˆ–è€…å‡çº§ã€‚"
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3751,7 +3853,7 @@
 "æŸäº›è½¯ä»¶åŒ…å¯ä»¥è¢«å‡çº§ï¼Œä½†æ˜¯æ‚¨å¹¶æœªé€‰æ‹©å‡çº§å®ƒä»¬ã€‚\n"
 "è¾“å…¥ â€œUâ€æ¥å‡†å¤‡å‡çº§ã€‚"
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3760,99 +3862,112 @@
 "æ›´æ–°è½¯ä»¶åŒ…åˆ—è¡¨éœ€è¦ç®¡ç†å‘˜æƒé™ï¼Œè€Œæ‚¨çŽ°åœ¨\n"
 "æ²¡æœ‰è¿™ç§æƒé™ã€‚æ‚¨æƒ³è¦è¿›å…¥ root å¸å·å—ï¼Ÿ\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "é€šè¿‡æ‰¾åœ°é›·æ¥æ¶ˆç£¨æ—¶é—´"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "åœ¨ä¸‹è½½è¿›è¡Œè¿‡ç¨‹ä¸ä¸å…è®¸æ‰§è¡Œæ¸…é™¤"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "åˆ é™¤ä¸‹è½½çš„æ–‡ä»¶"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "ä¸‹è½½çš„æ–‡ä»¶å·²ç»è¢«åˆ é™¤"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "è¿‡æœŸçš„ä¸‹è½½æ–‡ä»¶å·²ç»è¢«åˆ é™¤"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "é€šè¿‡æ‰¾åœ°é›·æ¥æ¶ˆç£¨æ—¶é—´"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "æ— æ³•æ‰“å¼€ %s ä»¥å†™å…¥"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "å®‰è£…/å¸è½½è½¯ä»¶åŒ…(^I)"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "æ‰§è¡Œæ‰€æœ‰ç‰å¾…æ‰§è¡Œçš„å®‰è£…å’Œå¸è½½ä»»åŠ¡"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "æ›´æ–°è½¯ä»¶åŒ…åˆ—è¡¨(^U)"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "æ£åœ¨æ£€æŸ¥æ–°ç‰ˆæœ¬çš„è½¯ä»¶åŒ…"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "å¿˜è®°æ–°è½¯ä»¶åŒ…(^F)"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "å¿˜è®°å“ªäº›è½¯ä»¶åŒ…æ˜¯â€œæ–°â€çš„"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "æ¸…é™¤è½¯ä»¶åŒ…ç¼“å˜(^C)"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "åˆ é™¤ä»¥å‰ä¸‹è½½çš„è½¯ä»¶åŒ…æ–‡ä»¶"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "å…³é—è¿‡æœŸæ–‡ä»¶(^O)"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "åˆ é™¤æ— æ³•å†ä¸‹è½½çš„è½¯ä»¶åŒ…æ–‡ä»¶"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "æ ‡è®°å¯å‡çº§çš„(^U)"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "ä¸ºæ‰€æœ‰æœªè¢«ä¿æŒçŽ°çŠ¶çš„è½¯ä»¶åŒ…åŠ ä¸Šå‡çº§æ ‡è®°"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "çŽ©æ‰«é›·æ¸¸æˆ(^P)"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "å˜æˆ root(^B)"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3861,78 +3976,78 @@
 "è¿è¡Œâ€œsuâ€æˆä¸º rootã€‚è¿™å°†é‡æ–°å¯åŠ¨ç¨‹åºï¼Œä½†æ˜¯æ‚¨çš„\n"
 "è®¾ç½®å°†ä¼šè¢«ä¿å˜ä¸‹æ¥ã€‚"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "é‡æ–°è½½å…¥è½¯ä»¶åŒ…ç¼“å˜(^R)"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "é‡æ–°è½½å…¥è½¯ä»¶åŒ…ç¼“å˜"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "é€€å‡º(^Q)"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "é€€å‡ºæ¤ç¨‹åº"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "æ’¤æ¶ˆ"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "æ’¤é”€æœ€è¿‘ä¸€æ¬¡æˆ–è€…ä¸€ç»„è½¯ä»¶åŒ…æ“ä½œ"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "å®‰è£…(^I)"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "æ ‡è®°å½“å‰é€‰æ‹©çš„è½¯ä»¶åŒ…ä»¥å®‰è£…æˆ–è€…å‡çº§"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "åˆ é™¤(^R)"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "æ ‡è®°å½“å‰é€‰æ‹©çš„è½¯ä»¶åŒ…ä»¥åˆ é™¤"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "æ¸…é™¤(^P)"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "æ ‡è®°å½“å‰é€‰æ‹©çš„è½¯ä»¶åŒ…å’Œå®ƒçš„é…ç½®æ–‡ä»¶ä»¥åˆ é™¤"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "ä¿æŒ(^K)"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "å–æ¶ˆé€‰å®šè½¯ä»¶åŒ…ä¸Šçš„ä»»ä½•åŠ¨ä½œ"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "ä¿æŒ(^H)"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "å–æ¶ˆé€‰å®šè½¯ä»¶åŒ…ä¸Šçš„ä»»ä½•åŠ¨ä½œï¼Œå¹¶ä¸”ä¿æŠ¤å®ƒå…äºŽä»¥åŽè¢«å‡çº§"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "æ ‡è®°ä¸ºè‡ªåŠ¨å®‰è£…(^A)"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -3941,11 +4056,11 @@
 "å°†æ‰€é€‰å®šçš„è½¯ä»¶åŒ…æ ‡è®°ä¸ºè‡ªåŠ¨å®‰è£…ï¼›\n"
 "å¦‚æžœæ²¡æœ‰å…¶å®ƒè½¯ä»¶åŒ…ä¾èµ–äºŽå®ƒï¼Œå®ƒå°†ä¼šè¢«è‡ªåŠ¨åˆ é™¤"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "æ ‡è®°ä¸ºæ‰‹åŠ¨å®‰è£…(^M)"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -3954,11 +4069,11 @@
 "å°†æ‰€é€‰å®šçš„è½¯ä»¶åŒ…æ ‡è®°ä¸ºæ‰‹åŠ¨å®‰è£…ï¼›\n"
 "é™¤éžæ‚¨æ‰‹åŠ¨åˆ é™¤è¯¥è½¯ä»¶åŒ…ï¼Œå¦åˆ™å®ƒå°†ä¸ä¼šè¢«åˆ é™¤"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "ç¦æ¢ç‰ˆæœ¬(^F)"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -3967,214 +4082,214 @@
 "ç¦æ¢å®‰è£…é€‰å®šè½¯ä»¶åŒ…çš„å€™é€‰ç‰ˆæœ¬ï¼›\n"
 "è¯¥è½¯ä»¶åŒ…çš„æ–°ç‰ˆæœ¬å°†å¯ä»¥æ£å¸¸å®‰è£…"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "ä¿¡æ¯(^N)"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "æ˜¾ç¤ºå…³äºŽé€‰å®šè½¯ä»¶åŒ…ä¸Šçš„æ›´å¤šä¿¡æ¯"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "å˜æ›´æ—¥å¿—(^C)"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "æ˜¾ç¤ºé€‰å®šè½¯ä»¶åŒ…ä¸Šçš„å˜æ›´æ—¥å¿—"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "æŸ¥æ‰¾(^F)"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "æœç´¢ä¸€ä¸ªè½¯ä»¶åŒ…"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "ç»§ç»æŸ¥æ‰¾(^A)"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "é‡å¤ä¸Šä¸€æ¬¡æŸ¥æ‰¾"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "é™åˆ¶æ˜¾ç¤º(^L)"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "ä½¿ç”¨è¿‡æ»¤å™¨è¿‡æ»¤è½¯ä»¶åŒ…åˆ—è¡¨"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "å–æ¶ˆæ˜¾ç¤ºé™åˆ¶(^U)"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "å–æ¶ˆè½¯ä»¶åŒ…åˆ—è¡¨ä¸è¿‡æ»¤å™¨çš„æ•ˆæžœ"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "æœå¯»æŸå(^F)"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "ä¸‹åˆ—è½¯ä»¶åŒ…å˜åœ¨æœªæ»¡è¶³çš„ä¾èµ–å…³ç³»ï¼š"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "ç”¨æˆ·ç•Œé¢é€‰é¡¹(^U)"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "ä¿®æ”¹å½±å“ç”¨æˆ·ç•Œé¢çš„è®¾ç½®"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "å¤„ç†ä¾èµ–å…³ç³»(^D)"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "æ”¹å˜å½±å“å¤„ç†ä¾èµ–å…³ç³»çš„è®¾ç½®"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "æ‚é¡¹(^M)"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "æ”¹å˜ç¨‹åºçš„æ‚é¡¹è®¾ç½®"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "è¿˜åŽŸé€‰é¡¹(^R)"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "æŠŠæ‰€æœ‰é¡¹ç›®é‡è®¾ä¸ºå®ƒä»¬çš„é»˜è®¤å€¼"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "ä¸‹ä¸€ä¸ª(^N)"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "æŸ¥çœ‹ä¸‹ä¸€ä¸ªç”»é¢"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "ä¸Šä¸€ä¸ª(^P)"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "æŸ¥çœ‹ä¸Šä¸€ç”»é¢"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "å…³é—(^C)"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "å…³é—æ¤ç”»é¢"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "æ–°å»ºè½¯ä»¶åŒ…è§†å›¾(^V)"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "åˆ›å»ºæ–°çš„é»˜è®¤è½¯ä»¶åŒ…è§†å›¾"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "æ–°å»ºåˆ†ç±»æµè§ˆå™¨(^B)"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "åˆ†ç±»æµè§ˆè½¯ä»¶åŒ…"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "å…³äºŽ(^A)"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "æŸ¥çœ‹å…³äºŽæ¤ç¨‹åºçš„ä¿¡æ¯"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "å¸®åŠ©(^H)"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "æŸ¥çœ‹åœ¨çº¿å¸®åŠ©"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "ç”¨æˆ·æ‰‹å†Œ(^M)"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "æŸ¥çœ‹è¯¦ç»†çš„ç¨‹åºä½¿ç”¨æ‰‹å†Œ"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "å¸¸è§é—®é¢˜å›žç”(^F)"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "æŸ¥çœ‹å¸¸è§é—®é¢˜åˆ—è¡¨"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "æŸ¥çœ‹è¯¥ç¨‹åºæ¯ä¸€ç‰ˆæœ¬ä¸æ‰€åšçš„é‡å¤§ä¿®æ”¹"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "è®¸å¯è¯(^L)"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "æŸ¥çœ‹æ‚¨å¯ä»¥åœ¨ä½•ç§æ¡æ¬¾ä¸‹æ‹·è´è¯¥ç¨‹åº"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "åŠ¨ä½œ"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "æœç´¢"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "é€‰é¡¹"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "æŸ¥çœ‹"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "å¸®åŠ©"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr "%sï¼šèœå•  %sï¼šå¸®åŠ©  %sï¼šé€€å‡º  %sï¼šæ›´æ–°  %sï¼šä¸‹è½½/å®‰è£…åŒ…"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "æ˜¯_æŒ‰é”®"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "å¦_æŒ‰é”®"
 
@@ -4216,13 +4331,56 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "å•Šï¼æŽ¥æ”¶åˆ° SIGQUIT ä¿¡å·ï¼Œæ£åœ¨é€€å‡º..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "æ˜¯"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "å¦"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "å‘½ä»¤ï¼š\n"
+#~ "   yï¼šç»§ç»è¿›è¡Œå®‰è£…\n"
+#~ "   nï¼šæ”¾å¼ƒå¹¶é€€å‡º\n"
+#~ "   iï¼šæ˜¾ç¤ºä¸€ä¸ªæˆ–è€…å¤šä¸ªè½¯ä»¶åŒ…çš„ä¿¡æ¯\n"
+#~ "      è½¯ä»¶åŒ…çš„åç§°åº”è¯¥åœ¨â€œiâ€ä¹‹åŽ \n"
+#~ "   cï¼šæ˜¾ç¤ºä¸€ä¸ªæˆ–å¤šä¸ªè½¯ä»¶åŒ…çš„ Debian å˜æ›´æ—¥å¿—ï¼›\n"
+#~ "      è½¯ä»¶åŒ…çš„åç§°åº”è¯¥åœ¨â€œcâ€ä¹‹åŽ\n"
+#~ "   dï¼šåˆ‡æ¢æ˜¯å¦æ˜¾ç¤ºä¾èµ–å…³ç³»ä¿¡æ¯\n"
+#~ "   sï¼šåˆ‡æ¢æ˜¯å¦æ˜¾ç¤ºè½¯ä»¶åŒ…å°ºå¯¸å˜åŒ–\n"
+#~ "   vï¼šåˆ‡æ¢æ˜¯å¦æ˜¾ç¤ºç‰ˆæœ¬å·\n"
+#~ "   eï¼šè¿›å…¥å…¨å›¾ç¤ºç•Œé¢\n"
+#~ "\n"
+#~ "   æ‚¨è¿˜å¯ä»¥æŒ‡å®šå¯¹è½¯ä»¶åŒ…åŠ¨ä½œé›†åˆè¿›è¡Œä¿®æ”¹ã€‚\n"
+#~ "   è¦å®žçŽ°ä¸Šè¿°æ“ä½œï¼Œåœ¨åŠ¨ä½œå—ç¬¦ä¹‹åŽé”®å…¥ä¸€ä¸ªæˆ–å¤šä¸ªè½¯ä»¶åŒ…åç§°æˆ–è€…æ¨¡å¼ã€‚è¯¥åŠ¨ä½œ"
+#~ "å°†\n"
+#~ "è¢«åº”ç”¨åˆ°å…¨éƒ¨è½¯ä»¶åŒ…ã€‚(æ‚¨å¯ä»¥æŒ‡å®šé™„åŠ çš„åŠ¨ä½œï¼›æ¯ä¸ªé™„åŠ åŠ¨ä½œå°†è¢«åº”ç”¨äºŽè·Ÿéšå…¶åŽ"
+#~ "çš„\n"
+#~ "å…¨éƒ¨è½¯ä»¶åŒ…)\n"
+#~ "\n"
+#~ "åŠ¨ä½œï¼š\n"
+#~ "  + ï¼šå®‰è£…\n"
+#~ "  - ï¼šåˆ é™¤\n"
+#~ "  _ : æ¸…é™¤\n"
+#~ "  = : ä¿æŒ\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

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	Sun May  1 17:18:21 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-04-29 18:11-0400\n"
+"POT-Creation-Date: 2005-05-01 13:15-0400\n"
 "PO-Revision-Date: 2004-09-30 12:40+0800\n"
 "Last-Translator: Rex Tsai <chihchun at linux.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n at linux.org.tw>\n"
@@ -148,7 +148,7 @@
 msgstr "è‡ªå‹•ç§»é™¤ç¬¦åˆæ¤éŽæ¿¾å™¨çš„æœªç”¨å¥—ä»¶"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/ui.cc:219 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
 #: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "ç¢ºå®š"
@@ -291,56 +291,56 @@
 "é™„è¨»: é¸æ“‡ \"%s\" ä»¥å–ä»£\n"
 "      è™›æ“¬å¥—ä»¶ \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:92
+#: src/cmdline/cmdline_action.cc:93
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s å·²ç¶“å®‰è£ç‚ºè¢«è¦æ±‚çš„ç‰ˆæœ¬ (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:98
+#: src/cmdline/cmdline_action.cc:99
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s å°šæœªå®‰è£ï¼Œå› æ¤ä¸æœƒè¢«é‡æ–°å®‰è£ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:105 src/cmdline/cmdline_action.cc:111
+#: 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 "Package %s æœªå®‰è£, å› æ¤å®ƒå°‡ä¸æœƒç§»é™¤\n"
 
-#: src/cmdline/cmdline_action.cc:123
+#: src/cmdline/cmdline_action.cc:130
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Package %s æœªå®‰è£, ç„¡æ³•ç¦åˆ¶å‡ç´š\n"
 
-#: src/cmdline/cmdline_action.cc:125
+#: src/cmdline/cmdline_action.cc:132
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Package %s å°‡ä¸æœƒå‡ç´š, ç„¡æ³•ç¦åˆ¶å‡ç´š\n"
 "\n"
 
-#: src/cmdline/cmdline_action.cc:198
+#: src/cmdline/cmdline_action.cc:211
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "é™„è¨»: é¸æ“‡å®‰è£ä½œæ¥ \"%s: %s\"\n"
 
-#: src/cmdline/cmdline_action.cc:225
+#: src/cmdline/cmdline_action.cc:238
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "æ‚¨åªèƒ½ä½¿ç”¨ 'install' æŒ‡ä»¤æŒ‡å®šå¥—ä»¶ç‰ˆæœ¬\n"
 
-#: src/cmdline/cmdline_action.cc:231
+#: src/cmdline/cmdline_action.cc:244
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "æ‚¨åªèƒ½ä½¿ç”¨ 'install' æŒ‡ä»¤æŒ‡å®šå¥—ä»¶æ¸æª”\n"
 
-#: src/cmdline/cmdline_action.cc:265
+#: 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"
 msgstr "ç„¡æ³•æ‰¾åˆ°å¥—ä»¶ \"%s\"ï¼Œè€Œä¸”è¶…éŽ 40 å„å¥—ä»¶åç¨±ä¸åŒ…å« \"%s\"ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:268
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -349,12 +349,12 @@
 "ç„¡æ³•æ‰¾åˆ°å¥—ä»¶ \"%s\"ã€‚ ç„¶è€Œï¼Œä»¥ä¸‹\n"
 "å¥—ä»¶åç¨±ä¸åŒ…å« \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:292
+#: src/cmdline/cmdline_action.cc:305
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "ç„¡æ³•æ‰¾åˆ°ä»»ä½•å¥—ä»¶çš„åç¨±æˆ–æ•˜è¿°å«æœ‰ \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:294
+#: src/cmdline/cmdline_action.cc:307
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -363,7 +363,7 @@
 "ç„¡æ³•æ‰¾åˆ°ä»»ä½•å¥—ä»¶å»åˆ \"%s\"ï¼Œè€Œä¸”è¶…éŽ 40 å„å¥—ä»¶çš„æ•˜è¿°åŒ…å«\n"
 "äº† \"%s\"ã€‚\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:310
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -372,6 +372,11 @@
 "ç„¡æ³•æ‰¾åˆ°ä»»ä½•å¥—ä»¶å»åˆ \"%s\"ã€‚ ç„¶è€Œï¼Œä»¥ä¸‹çš„å¥—ä»¶æ•˜è¿°ä¸åŒ…å«\n"
 "\"%s\":\n"
 
+#: src/cmdline/cmdline_action.cc:433
+#, c-format
+msgid "Bad action character '%c'\n"
+msgstr "éŒ¯èª¤çš„å‹•ä½œæŒ‡ä»¤éµ '%c'\n"
+
 #: src/cmdline/cmdline_changelog.cc:28
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "ç„¡æ³•åŸ·è¡Œ sensible-pager, é€™æ˜¯æ£å¸¸çš„ Debian ç³»çµ±å—Žï¼Ÿ"
@@ -411,7 +416,7 @@
 msgid "Invalid operation %s"
 msgstr "ç„¡æ•ˆçš„æ“ä½œâ€œ%sâ€"
 
-#: src/cmdline/cmdline_do_action.cc:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_do_action.cc:207 src/cmdline/cmdline_simulate.cc:31
 #: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
@@ -422,16 +427,16 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "ä¸‹è¼‰: ä½ å¿…é ˆè‡³å°‘æŒ‡å®šä¸€å€‹ä¸‹è¼‰å¥—ä»¶\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
+#: src/cmdline/cmdline_download.cc:41 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "ç„¡æ³•è®€å–æºåˆ—è¡¨æª”æ¡ˆ"
 
-#: src/cmdline/cmdline_download.cc:64
+#: src/cmdline/cmdline_download.cc:62
 #, c-format
 msgid "Can't find a package named \"%s\""
 msgstr "ç„¡æ³•æ‰¾åˆ°ä»»ä½•å¥—ä»¶çš„åç¨± \"%s\""
 
-#: src/cmdline/cmdline_download.cc:74
+#: src/cmdline/cmdline_download.cc:72
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -484,95 +489,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "é€™æ˜¯ä»€éº¼? é€™ç•¶ç„¶æ˜¯ä¸€éš»å¤§è±¡è¢«ä¸€éš»è›‡åžæŽ‰ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:45
+#: src/cmdline/cmdline_prompt.cc:46
 msgid "Couldn't read list of sources"
 msgstr "ç„¡æ³•è®€å–å¥—ä»¶ä¾†æºåˆ—è¡¨"
 
-#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:221 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "ä½† %s å°‡æœƒå®‰è£ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:223 src/cmdline/cmdline_show_broken.cc:76
+#: 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 "ä½† %s å·²å®‰è£ä¸”ä¿æŒç¾æœ‰ç‰ˆæœ¬ã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:227 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ä½† %s å·²å®‰è£"
 
-#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:231 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "ä½†é€™ç„¡æ³•å®‰è£"
 
-#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:235 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " é€™æ˜¯è™›æ“¬å¥—ä»¶"
 
-#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:238 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " æˆ–"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are BROKEN:"
 msgstr "ä»¥ä¸‹çš„å¥—ä»¶ç‹€æ…‹ç‚ºæ¯€æ–·"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "ä»¥ä¸‹æœªä½¿ç”¨çš„å¥—ä»¶å°‡æœƒç§»é™¤:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following packages have been automatically kept back:"
 msgstr "ä»¥ä¸‹å¥—ä»¶å·²ç¶“è¨ç‚ºè‡ªå‹•ä¿æŒç¾ç‹€:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following NEW packages will be automatically installed:"
 msgstr "ä»¥ä¸‹æ–°å¥—ä»¶å°‡æœƒè‡ªå‹•å®‰è£:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be automatically REMOVED:"
 msgstr "ä»¥ä¸‹å¥—ä»¶å°‡æœƒè‡ªå‹•ç§»é™¤:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages will be DOWNGRADED:"
 msgstr "ä»¥ä¸‹å¥—ä»¶å°‡æœƒè‡ªå‹•é™ç´š:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages have been kept back:"
 msgstr "ä»¥ä¸‹å¥—ä»¶å·²ç¶“è¨ç‚ºä¿æŒç¾ç‹€:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following packages will be REINSTALLED:"
 msgstr "ä»¥ä¸‹å¥—ä»¶å°‡é‡æ–°å®‰è£:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following NEW packages will be installed:"
 msgstr "ä»¥ä¸‹æ–°å¥—ä»¶å°‡æœƒå®‰è£:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be REMOVED:"
 msgstr "ä»¥ä¸‹æ–°å¥—ä»¶å°‡æœƒç§»é™¤:"
 
-#: src/cmdline/cmdline_prompt.cc:259
+#: src/cmdline/cmdline_prompt.cc:260
 msgid "The following packages will be upgraded:"
 msgstr "ä»¥ä¸‹å¥—ä»¶å°‡æœƒå‡ç´š:"
 
-#: src/cmdline/cmdline_prompt.cc:311
+#: src/cmdline/cmdline_prompt.cc:312
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "ä»¥ä¸‹åŸºæœ¬å¥—ä»¶å°‡æœƒç§»é™¤ï¼\n"
 
-#: src/cmdline/cmdline_prompt.cc:320
+#: src/cmdline/cmdline_prompt.cc:321
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "ä»¥ä¸‹åŸºæœ¬å¥—ä»¶å°‡æœƒå› æ¤å‹•ä½œè€Œæ¯€æ–·ï¼\n"
 
-#: src/cmdline/cmdline_prompt.cc:330
+#: src/cmdline/cmdline_prompt.cc:331
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -581,99 +586,226 @@
 "è¦å‘Š: åŸ·è¡Œä»¥ä¸‹å‹•ä½œå¯èƒ½æœƒé€ æˆæ‚¨çš„ç³»çµ±æ¯€å£žï¼\n"
 "             ä¸è¦æŒçºŒé€²è¡Œï¼Œç„¡éžæ‚¨å¾ˆæ¸…æ¥šè‡ªå·±åœ¨åšä»€éº¼ï¼\n"
 
-#: src/cmdline/cmdline_prompt.cc:332
+#: src/cmdline/cmdline_prompt.cc:333
 msgid "I am aware that this is a very bad idea"
 msgstr "I am aware that this is a very bad idea"
 
-#: src/cmdline/cmdline_prompt.cc:335
+#: src/cmdline/cmdline_prompt.cc:336
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "è¦ç¹¼çºŒï¼Œè«‹è¼¸å…¥ä»¥ä¸‹è²æ˜Ž  \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:438
+#: src/cmdline/cmdline_prompt.cc:375
+#, c-format
+msgid ""
+"WARNING: untrusted versions of the following packages will be installed!\n"
+"\n"
+"Untrusted packages could compromise your system's security.\n"
+"You should only proceed with the installation if you are certain that\n"
+"this is what you want to do.\n"
+"\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "Yes"
+msgstr "æ˜¯(Y)"
+
+#: src/cmdline/cmdline_prompt.cc:384 src/vscreen/vs_util.cc:175
+#: src/vscreen/vs_util.cc:212
+msgid "No"
+msgstr "å¦(N)"
+
+#: src/cmdline/cmdline_prompt.cc:388
+#, c-format
+msgid "Do you want to ignore this warning and proceed anyway?\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:389
+#, fuzzy, c-format
+msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
+msgstr "è¦ç¹¼çºŒï¼Œè«‹è¼¸å…¥ä»¥ä¸‹è²æ˜Ž  \"%s\":\n"
+
+#: src/cmdline/cmdline_prompt.cc:400
+#, c-format
+msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:499
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "ä»¥ä¸‹å¥—ä»¶å—åˆ°æŽ¨è–¦ä½†æ˜¯å°‡ä¸æœƒå®‰è£:\n"
 
-#: src/cmdline/cmdline_prompt.cc:444
+#: src/cmdline/cmdline_prompt.cc:505
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "ä»¥ä¸‹å¥—ä»¶å—åˆ°å»ºè°ä½†æ˜¯å°‡ä¸æœƒå®‰è£:\n"
 
-#: src/cmdline/cmdline_prompt.cc:449
+#: src/cmdline/cmdline_prompt.cc:510
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "æ²’æœ‰å¥—ä»¶å°‡æœƒè¢«å®‰è£ã€å‡ç´šæˆ–ç§»é™¤ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:512
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu å€‹å¥—ä»¶å‡ç´š, %lu å€‹æ–°å®‰è£, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:516
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu å€‹é‡æ–°å®‰è£, "
 
-#: src/cmdline/cmdline_prompt.cc:457
+#: src/cmdline/cmdline_prompt.cc:518
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu å€‹é™ç´š, "
 
-#: src/cmdline/cmdline_prompt.cc:459
+#: src/cmdline/cmdline_prompt.cc:520
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu å€‹å°‡ç§»é™¤ä¸” %lu å€‹ä¸æœƒå‡ç´š.\n"
 
-#: src/cmdline/cmdline_prompt.cc:466
+#: src/cmdline/cmdline_prompt.cc:527
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "éœ€è¦ä¸‹è¼‰ %sB/%sB çš„æ¸æª”æª”æ¡ˆ. "
 
-#: src/cmdline/cmdline_prompt.cc:469
+#: src/cmdline/cmdline_prompt.cc:530
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "éœ€è¦ä¸‹è¼‰ %sB çš„æ¸æª”æª”æ¡ˆ. "
 
-#: src/cmdline/cmdline_prompt.cc:476
+#: src/cmdline/cmdline_prompt.cc:537
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "è§£è£å¾Œå°‡ç”¨åŽ» %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:479
+#: src/cmdline/cmdline_prompt.cc:540
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "è§£è£å¾Œå°‡é‡‹å‡º %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:524
-#, c-format
-msgid "Bad action character '%c'\n"
-msgstr "éŒ¯èª¤çš„å‹•ä½œæŒ‡ä»¤éµ '%c'\n"
-
-#: src/cmdline/cmdline_prompt.cc:595
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "ç„¡é¡¯ç¤ºå¥—ä»¶ -- è«‹åœ¨ 'i' ä¹‹å¾Œè¼¸å…¥å¥—ä»¶åç¨±ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:597
+#: src/cmdline/cmdline_prompt.cc:580
 msgid "Press Return to continue."
 msgstr "æŒ‰ Return ç¹¼çºŒã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:623
+#: src/cmdline/cmdline_prompt.cc:606
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "æœªæ‰¾åˆ°å¥—ä»¶ -- è«‹åœ¨ 'c' ä¹‹å¾Œè¼¸å…¥å¥—ä»¶åç¨±ã€‚\n"
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:610
 #, fuzzy
 msgid "Press Return to continue"
 msgstr "æŒ‰ Return ç¹¼çºŒã€‚"
 
-#: src/cmdline/cmdline_prompt.cc:675
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:641
+msgid "continue with the installation"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:643
+msgid "abort and quit"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:645
+msgid ""
+"show information about one or more packages; the package names should follow "
+"the 'i'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:647
+msgid ""
+"show the Debian changelogs of one or more packages; the package names should "
+"follow the 'c'"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:649
+msgid "toggle the display of dependency information"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:651
+#, fuzzy
+msgid "toggle the display of changes in package sizes"
+msgstr "æŸ¥çœ‹å¥—ä»¶çš„é¡¯ç¤ºæ ¼å¼"
+
+#: src/cmdline/cmdline_prompt.cc:653
+msgid "toggle the display of version numbers"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:655
+msgid "enter the full visual interface"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:656
+msgid ""
+"You may also specify modifaction 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
+#, fuzzy
+msgid "'+' to install packages"
+msgstr "å®‰è£/ç§»é™¤å¥—ä»¶(^I)"
+
+#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
+#, fuzzy
+msgid ""
+"'+M' to install packages and immediately flag them as automatically installed"
+msgstr "ä»¥ä¸‹æ–°å¥—ä»¶å°‡æœƒè‡ªå‹•å®‰è£:"
+
+#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
+#, fuzzy
+msgid "'-' to remove packages"
+msgstr "å®‰è£/ç§»é™¤å¥—ä»¶(^I)"
+
+#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
+#, fuzzy
+msgid "'_' to purge packages"
+msgstr "å¿½ç•¥æ–°å¥—ä»¶(^F)"
+
+#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
+#, fuzzy
+msgid "'=' to place packages on hold"
+msgstr " hold         - å°‡å¥—ä»¶ç½®æ–¼ä¿æŒç‹€æ…‹\n"
+
+#: 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 ""
+
+#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
+#, fuzzy
+msgid "'&M' to mark packages as automatically installed"
+msgstr " markauto     - å°‡å¥—ä»¶æ¨™è¨˜ç‚ºè‡ªå‹•å®‰è£\n"
+
+#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
+#, fuzzy
+msgid "'&m' to mark packages as manually installed"
+msgstr " unmarkauto   - å°‡å¥—ä»¶æ¨™è¨˜ç‚ºæ‰‹å‹•å®‰è£\n"
+
+#: src/cmdline/cmdline_prompt.cc:677
+#, fuzzy
+msgid "Commands:"
+msgstr "æŽ¨è–¦"
+
+#: src/cmdline/cmdline_prompt.cc:732
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "æ‚¨æƒ³ç¹¼çºŒå—Ž? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:757
 #, c-format
 msgid ""
 "\n"
@@ -684,7 +816,7 @@
 "ç›¸ä¾æ€§è³‡è¨Šå°‡æœƒé¡¯ç¤ºã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:702
+#: src/cmdline/cmdline_prompt.cc:759
 #, c-format
 msgid ""
 "\n"
@@ -695,7 +827,7 @@
 "ç›¸ä¾æ€§è³‡è¨Šå°‡ä¸æœƒé¡¯ç¤ºã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:708
+#: src/cmdline/cmdline_prompt.cc:765
 #, c-format
 msgid ""
 "\n"
@@ -706,7 +838,7 @@
 "ç‰ˆæœ¬å°‡æœƒé¡¯ç¤ºã€‚\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:710
+#: src/cmdline/cmdline_prompt.cc:767
 #, c-format
 msgid ""
 "\n"
@@ -717,7 +849,7 @@
 "ç‰ˆæœ¬å°‡ä¸æœƒé¡¯ç¤º\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:715
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +860,7 @@
 "è®Šå‹•å¤§å°å°‡æœƒé¡¯ç¤º\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:717
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid ""
 "\n"
@@ -739,127 +871,102 @@
 "è®Šå‹•å¤§å°å°‡ä¸æœƒé¡¯ç¤º\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:737
-#, c-format
-msgid ""
-"Commands:\n"
-"  y: continue with the installation\n"
-"  n: abort and quit\n"
-"  i: show information about one or more packages;\n"
-"     the package names should follow 'i'\n"
-"  c: show the Debian changelogs of one or more packages;\n"
-"     the package names should follow 'c'\n"
-"  d: toggle display of dependency information\n"
-"  s: toggle display of changes in package sizes\n"
-"  v: toggle display of versions\n"
-"  e: enter the full visual interface\n"
-"\n"
-"  You may also specify modifications to the set of package actions.\n"
-"  To do so, type an action character followed by one or more package names\n"
-"or patterns.  The action will be applied to all packages. (you may specify\n"
-"additional actions; each will be applied to all packages that follow it)\n"
-"\n"
-"Actions:\n"
-"  + : Install\n"
-"  - : Remove\n"
-"  _ : Purge\n"
-"  = : Hold\n"
-msgstr ""
-"å‘½ä»¤:\n"
-"  y: ç¹¼çºŒå®‰è£\n"
-"  n: çµ‚æ¢ä¸¦é€€å‡º\n"
-"  d: é¡¯ç¤ºç›¸ä¾è¨Šæ¯\n"
-"  i: é¡¯ç¤ºä¸€å€‹ä»¥ä¸Šå¥—ä»¶è³‡è¨Š;\n"
-"     å¥—ä»¶åç¨±æ‡‰è©²æŽ’åœ¨ 'i' ä¹‹å¾Œ\n"
-"  c: é¡¯ç¤ºä¸€å€‹ä»¥ä¸Šå¥—ä»¶çš„ Debian æ›´æ”¹ç´€éŒ„;\n"
-"     å¥—ä»¶åç¨±æ‡‰è©²æŽ’åœ¨ 'c' ä¹‹å¾Œ\n"
-"  s: é¡¯ç¤ºå¥—ä»¶è®Šæ›´å¤§å°\n"
-"  v: é¡¯ç¤ºç‰ˆæœ¬\n"
-"  e: é€²å…¥å…¨è¦–é‡Žä»‹é¢\n"
-"\n"
-"  æ‚¨ä¹Ÿå¯ä»¥æŒ‡å®šå°å¥—ä»¶çµ„é€²è¡Œç‰¹å®šæŒ‡ä»¤è™•ç†ã€‚\n"
-"  è¦é€™éº¼ä½œï¼Œè«‹è¼¸å…¥ä»¥ä¸‹å—å…ƒå¾Œä¸¦è¼¸å…¥å¥—ä»¶åç¨±æˆ–æ¨£å¼ã€‚\n"
-"å‹•ä½œæœƒå¥—ç”¨åœ¨æ‰€æœ‰å¥—ä»¶ä¸Š(æ‚¨æˆ–è¨±å¯ä»¥æŒ‡å®šé¡å¤–æŒ‡ä»¤;æ¯å€‹æŒ‡ä»¤éƒ½æœƒå¥—ç”¨åœ¨æ‰€æœ‰å¯«åœ¨å…¶å¾Œ"
-"çš„å¥—ä»¶ä¸Š)\n"
-"\n"
-"æŒ‡ä»¤:\n"
-"  + : å®‰è£\n"
-"  - : ç§»é™¤\n"
-"  _ : æ¸…é™¤\n"
-"  = : ä¿ç•™\n"
-
-#: src/cmdline/cmdline_prompt.cc:761
+#: src/cmdline/cmdline_prompt.cc:797
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "éŒ¯èª¤å›žæ‡‰ã€‚è«‹è¼¸å…¥ä¸€å€‹æ£ç¢ºçš„æŒ‡ä»¤æˆ– '?' ä»¥å–å¾—å”åŠ©ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:84
+#: src/cmdline/cmdline_resolver.cc:93
 #, c-format
-msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90
+#: src/cmdline/cmdline_resolver.cc:108
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:92
+#: src/cmdline/cmdline_resolver.cc:110
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:94
+#: src/cmdline/cmdline_resolver.cc:112
 #, fuzzy
 msgid "give up and quit the program"
 msgstr "é€€å‡ºæ¤ç¨‹åº"
 
-#: src/cmdline/cmdline_resolver.cc:96
+#: src/cmdline/cmdline_resolver.cc:114
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98
+#: src/cmdline/cmdline_resolver.cc:116
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:131
+#: src/cmdline/cmdline_resolver.cc:118
+msgid "adjust the state of the listed packages, where ACTION is one of:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:136
+msgid ""
+"Adjustments will cause the current solution to be discarded and recalculated "
+"as necessary."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:169
 #, fuzzy
 msgid "The following actions will resolve these dependencies:"
 msgstr "ä»¥ä¸‹å¥—ä»¶å«æœ‰ç›¸ä¾æ€§:\n"
 
-#: src/cmdline/cmdline_resolver.cc:146
-msgid "Accept this solution? [Y/n/q/?]"
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:212
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:222
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "ä»¥ä¸‹çš„å¥—ä»¶ç‹€æ…‹ç‚ºæ¯€æ–·"
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:237
+msgid "File to write resolver state to: "
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
+#, c-format
+msgid "Unable to open %s for writing"
+msgstr "ç„¡æ³•æ‰“é–‹ %s ä»¥å¯«å…¥"
+
+#: src/cmdline/cmdline_resolver.cc:245
+#, fuzzy, c-format
+msgid "Error writing resolver state to %s"
+msgstr "å¯«å…¥ç‹€æ…‹æª”æ¡ˆæ™‚ç™¼ç”ŸéŒ¯èª¤"
+
+#: src/cmdline/cmdline_resolver.cc:250
 #, fuzzy
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "éŒ¯èª¤å›žæ‡‰ã€‚è«‹è¼¸å…¥ä¸€å€‹æ£ç¢ºçš„æŒ‡ä»¤æˆ– '?' ä»¥å–å¾—å”åŠ©ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:260
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:226
+#: src/cmdline/cmdline_resolver.cc:288
 #, fuzzy
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "éŒ¯èª¤å›žæ‡‰ã€‚è«‹è¼¸å…¥ä¸€å€‹æ£ç¢ºçš„æŒ‡ä»¤æˆ– '?' ä»¥å–å¾—å”åŠ©ã€‚\n"
 
-#: src/cmdline/cmdline_resolver.cc:235
+#: src/cmdline/cmdline_resolver.cc:297
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:240
+#: src/cmdline/cmdline_resolver.cc:302
 msgid "No more solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_search.cc:76
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "æœå°‹: æ‚¨è‡³å°‘è¦æä¾›ä¸€å€‹æœå°‹å—ä¸²\n"
@@ -1154,7 +1261,7 @@
 msgid "Couldn't clean out list directories"
 msgstr "ç„¡æ³•æ¸…ç©ºåˆ—è¡¨ç›®éŒ„"
 
-#: src/download.cc:177 src/ui.cc:1152
+#: src/download.cc:177 src/ui.cc:1153
 msgid "Deleting obsolete downloaded files"
 msgstr "åˆªé™¤éŽæœŸçš„ä¸‹è¼‰æª”æ¡ˆ"
 
@@ -1434,23 +1541,18 @@
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "ç„¡æ³•ä¿®æ£ä¾è³´é—œä¿‚ï¼Œä¸€äº›åŒ…ç„¡æ³•å®‰è£"
 
-#: src/generic/aptcache.cc:1546
+#: src/generic/aptcache.cc:1572
 msgid "The list of sources could not be read."
 msgstr "ç„¡æ³•è®€å–è»Ÿé«”æºåˆ—è¡¨ã€‚"
 
-#: src/generic/aptcache.cc:1553
+#: src/generic/aptcache.cc:1579
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ç„¡æ³•è§£æžæˆ–æ‰“é–‹å¥—ä»¶åˆ—è¡¨æª”æ¡ˆæˆ–ç‹€æ…‹æª”æ¡ˆã€‚"
 
-#: src/generic/aptcache.cc:1556
+#: src/generic/aptcache.cc:1582
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "æ‚¨å¯èƒ½éœ€è¦æ›´æ–°å¥—ä»¶åˆ—è¡¨ä¾†è§£æ±ºç¼ºå°‘é€™äº›æª”æ¡ˆçš„å•é¡Œ"
 
-#: src/generic/apt.cc:142
-#, c-format
-msgid "Unable to open %s for writing"
-msgstr "ç„¡æ³•æ‰“é–‹ %s ä»¥å¯«å…¥"
-
 #: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
@@ -1715,17 +1817,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "ç„¡æ•ˆçš„æŽ’åºç–ç•¥é¡žåž‹â€œ%sâ€"
 
-#: src/main.cc:67
+#: src/main.cc:69
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s ç·¨è¯æ–¼ %s %s\n"
 
-#: src/main.cc:70
+#: src/main.cc:72
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "ç·¨è¯å™¨ï¼šg++ %s\n"
 
-#: src/main.cc:73
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1734,7 +1836,7 @@
 "\n"
 "NCurses ç‰ˆæœ¬ï¼š%s\n"
 
-#: src/main.cc:75
+#: src/main.cc:77
 #, c-format
 msgid ""
 "\n"
@@ -1743,22 +1845,22 @@
 "\n"
 "Curses ç‰ˆæœ¬ï¼š%s\n"
 
-#: src/main.cc:77
+#: src/main.cc:79
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ ç‰ˆæœ¬ï¼š%s\n"
 
-#: src/main.cc:83
+#: src/main.cc:85
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "ç”¨æ³•ï¼š aptitude [-s æª”æ¡ˆå] [-u|-i]"
 
-#: src/main.cc:85
+#: src/main.cc:87
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [é¸é …] <å‹•ä½œ> ..."
 
-#: src/main.cc:87
+#: src/main.cc:89
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1767,252 +1869,252 @@
 "  å‹•ä½œ (å¦‚æžœæœªæŒ‡å®šï¼Œaptitude å°‡é€²å…¥äº¤äº’æ¨¡å¼)ï¼š\n"
 "\n"
 
-#: src/main.cc:88
+#: src/main.cc:90
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - å®‰è£/å‡ç´šå¥—ä»¶\n"
 
-#: src/main.cc:89
+#: src/main.cc:91
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - ç§»é™¤å¥—ä»¶\n"
 
-#: src/main.cc:90
+#: src/main.cc:92
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - ç§»é™¤å¥—ä»¶ä¸¦åˆªé™¤å…¶é…ç½®æª”æ¡ˆ\n"
 
-#: src/main.cc:91
+#: src/main.cc:93
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - å°‡å¥—ä»¶ç½®æ–¼ä¿æŒç‹€æ…‹\n"
 
-#: src/main.cc:92
+#: src/main.cc:94
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - å–æ¶ˆå°ä¸€å€‹å¥—ä»¶çš„ä¿æŒå‘½ä»¤\n"
 
-#: src/main.cc:93
+#: src/main.cc:95
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - å°‡å¥—ä»¶æ¨™è¨˜ç‚ºè‡ªå‹•å®‰è£\n"
 
-#: src/main.cc:94
+#: src/main.cc:96
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - å°‡å¥—ä»¶æ¨™è¨˜ç‚ºæ‰‹å‹•å®‰è£\n"
 
-#: src/main.cc:99
+#: src/main.cc:101
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr "ç¦åˆ¶ç‰ˆæœ¬ - ç¦æ¢ aptitude å‡ç´šç‰¹å®šçš„å¥—ä»¶ç‰ˆæœ¬ã€‚\n"
 
-#: src/main.cc:100
+#: src/main.cc:102
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - ä¸‹è¼‰æ–°/å¯å‡ç´šå¥—ä»¶åˆ—è¡¨\n"
 
-#: src/main.cc:101
+#: src/main.cc:103
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - åŸ·è¡Œä¸€æ¬¡å®‰å…¨çš„å‡ç´š\n"
 
-#: src/main.cc:102
+#: src/main.cc:104
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr " dist-upgrade - åŸ·è¡Œå‡ç´šï¼Œå¯èƒ½æœƒå®‰è£å’Œç§»é™¤å¥—ä»¶\n"
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - å¿½ç•¥å“ªäº›å¥—ä»¶æ˜¯â€œæ–°â€çš„\n"
 
-#: src/main.cc:104
+#: src/main.cc:106
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr " search       - æŒ‰åç¨± å’Œ/æˆ– è¡¨é”å¼æœå°‹å¥—ä»¶\n"
 
-#: src/main.cc:105
+#: src/main.cc:107
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - é¡¯ç¤ºå¥—ä»¶ç´°ç¯€è³‡è¨Š\n"
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - åˆªé™¤å·²ä¸‹è¼‰çš„å¥—ä»¶æª”æ¡ˆ\n"
 
-#: src/main.cc:107
+#: src/main.cc:109
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - åˆªé™¤èˆŠçš„å·²ä¸‹è¼‰å¥—ä»¶æª”æ¡ˆ\n"
 
-#: src/main.cc:108
+#: src/main.cc:110
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " æ›´æ”¹ç´€éŒ„    - è¦‹è˜å¥—ä»¶çš„æ›´æ”¹ç´€éŒ„\n"
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - ä¸‹è¼‰å¥—ä»¶çš„ .deb æª”æ¡ˆ\n"
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid "  Options:\n"
 msgstr "  é¸é …ï¼š\n"
 
-#: src/main.cc:112
+#: src/main.cc:114
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             æ¤æ±‚åŠ©ç´”æ–‡å—\n"
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             æ¨¡æ“¬å‹•ä½œï¼Œä½†æ˜¯ä¸¦ä¸çœŸæ£åŸ·è¡Œã€‚\n"
 
-#: src/main.cc:114
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             åƒ…åƒ…ä¸‹è¼‰å¥—ä»¶ï¼Œä¸å®‰è£æˆ–è€…ç§»é™¤ä»»ä½•æ±è¥¿ã€‚\n"
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             ç¸½æ˜¯æç¤ºç¢ºèªåŸ·è¡Œå‹•ä½œ\n"
 
-#: src/main.cc:116
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             å‡è¨å°ç°¡å–®çš„ æ˜¯/å¦ å•é¡Œå›žç”â€œæ˜¯â€\n"
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr " -F æ ¼å¼        æŒ‡å®šé¡¯ç¤ºæœå°‹çµæžœçš„æ ¼å¼ï¼›åƒè¦‹æ‰‹å†Š\n"
 
-#: src/main.cc:118
+#: src/main.cc:120
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr " -O æ¬¡åº        æŒ‡å®šå¦‚ä½•æŽ’åˆ—é¡¯ç¤ºæœå°‹çµæžœï¼›åƒè¦‹æ‰‹å†Š\n"
 
-#: src/main.cc:119
+#: src/main.cc:121
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w å¯¬åº¦        æŒ‡å®šé¡¯ç¤ºæœå°‹çµæžœçš„æ ¼å¼å¯¬åº¦\n"
 
-#: src/main.cc:120
+#: src/main.cc:122
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             ç©æ¥µåœ°å˜—è©¦ä¿®å¾©æå£žçš„å¥—ä»¶ã€‚\n"
 
-#: src/main.cc:121
+#: src/main.cc:123
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             é¡¯ç¤ºå°±è¦å®‰è£çš„å¥—ä»¶ç‰ˆæœ¬ã€‚\n"
 
-#: src/main.cc:122
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             é¡¯ç¤ºè‡ªå‹•æ”¹è®Šçš„å¥—ä»¶çš„ä¾è³´é—œä¿‚\n"
 
-#: src/main.cc:123
+#: src/main.cc:125
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    é¡¯ç¤ºæ¯å€‹å¥—ä»¶çš„å®‰è£å°ºå¯¸çš„è®ŠåŒ–ã€‚\n"
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v             é¡¯ç¤ºé™„åŠ è¨Šæ¯ã€‚(å¯èƒ½æœƒæä¾›å¤šæ¬¡) \n"
 
-#: src/main.cc:125
+#: src/main.cc:127
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [release]   è¨ç½®å°‡è¦å®‰è£çš„å¥—ä»¶çš„ç™¼å¸ƒç‰ˆæœ¬\n"
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o key=val     ç›´æŽ¥æŒ‡å®šåç¨±ç‚º 'key' çš„è¨å®šé¸é …\n"
 
-#: src/main.cc:127
+#: src/main.cc:129
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr " --with(out)-recommends\tæŒ‡å®šæ˜¯å¦å°‡æŽ¨è–¦(å»ºè°)è™•ç†ç‚ºå¼·ä¾è³´é—œä¿‚ã€‚\n"
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fname: å¾žæª”æ¡ˆåä¸è®€å– aptitude çš„å»¶ä¼¸ç‹€æ…‹è³‡è¨Šã€‚\n"
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : é–‹å§‹åŸ·è¡Œæ™‚ä¸‹è¼‰æ–°çš„å¥—ä»¶åˆ—è¡¨ã€‚\n"
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : é–‹å§‹åŸ·è¡Œæ™‚åŸ·è¡Œå®‰è£ã€‚\n"
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  é€™å€‹ aptitude ç„¡è¶…ç´šç‰›åŠ›ã€‚\n"
 
-#: src/main.cc:253
+#: src/main.cc:255
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o éœ€è¦ä¸€å€‹åƒæ•¸å¦‚ key=value, å¾— %s"
 
-#: src/main.cc:299 src/main.cc:308
+#: src/main.cc:301 src/main.cc:310
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "è©ç•°ï¼šæ”¶åˆ°æœªçŸ¥çš„é¸é …ä»£ç¢¼\n"
 
-#: src/main.cc:317
+#: src/main.cc:319
 msgid "Only one of -u and -i may be specified\n"
 msgstr "é¸é … -u å’Œ -i åªèƒ½æŒ‡å®šä¸€å€‹\n"
 
-#: src/main.cc:325
+#: src/main.cc:327
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "é¸é … -u å’Œ -i ä¸èƒ½åœ¨å‘½ä»¤è¡Œæ¨¡å¼ä¸æŒ‡å®š (ä¾‹å¦‚ï¼Œå’Œâ€œinstallâ€ä¸€èµ·)"
 
-#: src/main.cc:342
+#: src/main.cc:348
 msgid "-u and -i may not be specified with a command"
 msgstr "é¸é … -u å’Œ -i ä¸èƒ½åœ¨å’Œä¸€å€‹å‘½ä»¤ä¸€èµ·æŒ‡å®š "
 
-#: src/main.cc:399
+#: src/main.cc:405
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "æœªçŸ¥çš„å‘½ä»¤â€œ%sâ€\n"
 
-#: src/main.cc:406 src/main.cc:463
+#: src/main.cc:412 src/main.cc:469
 msgid "Internal error: uncaught 'out of solutions' exception.\n"
 msgstr ""
 
-#: src/main.cc:411 src/main.cc:468
+#: src/main.cc:417 src/main.cc:474
 msgid "Internal error: uncaught 'out of time' exception.\n"
 msgstr ""
 
-#: src/main.cc:418
+#: src/main.cc:424
 #, c-format
 msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
@@ -2043,7 +2145,7 @@
 msgid "Lost"
 msgstr "è¼¸"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1089
+#: src/mine/cmine.cc:119 src/ui.cc:1090
 msgid "Minesweeper"
 msgstr "æŽƒé›·"
 
@@ -2217,7 +2319,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:84 src/ui.cc:1638
+#: src/pkg_columnizer.cc:84 src/ui.cc:1670
 msgid "Package"
 msgstr "å¥—ä»¶"
 
@@ -3598,52 +3700,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:164
+#: src/ui.cc:165
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "å—¯ï¼Œæ²’æœ‰ä»»ä½•éŒ¯èª¤ï¼Œé€™ä¸æ‡‰è©²ç™¼ç”Ÿ.."
 
-#: src/ui.cc:170
+#: src/ui.cc:171
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:173
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:193
+#: src/ui.cc:194
 msgid "Search for:"
 msgstr "æœå°‹ï¼š"
 
-#: src/ui.cc:261
+#: src/ui.cc:262
 msgid "You already are root!"
 msgstr "æ‚¨å·²ç¶“æ˜¯ root äº†ï¼"
 
-#: src/ui.cc:359
+#: src/ui.cc:360
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "åç¨‹åºè¿”å›žä¸€å€‹éŒ¯èª¤ -- æ‚¨è¼¸å…¥çš„å¯†ç¢¼æ£ç¢ºå—Žï¼Ÿ"
 
-#: src/ui.cc:387
+#: src/ui.cc:388
 msgid "Loading cache"
 msgstr "è¼‰å…¥å¿«å–"
 
-#: src/ui.cc:409
+#: src/ui.cc:410
 msgid "Really quit Aptitude?"
 msgstr "çœŸçš„è¦é€€å‡º Aptitude å—Žï¼Ÿ"
 
-#: src/ui.cc:488
+#: src/ui.cc:489
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "çœŸçš„è¦æ”¾æ£„æ‚¨çš„å€‹äººè¨ç½®ä¸¦è¼‰å…¥é è¨å€¼å—Žï¼Ÿ"
 
-#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
+#: src/ui.cc:589 src/ui.cc:591 src/ui.cc:619 src/ui.cc:621
 msgid "Packages"
 msgstr "å¥—ä»¶"
 
-#: src/ui.cc:589 src/ui.cc:619
+#: src/ui.cc:590 src/ui.cc:620
 msgid "View available packages and choose actions to perform"
 msgstr "æŸ¥çœ‹å¯é¸å¥—ä»¶ä»¥åŠé¸æ“‡è¦åŸ·è¡Œçš„å‹•ä½œ"
 
-#: src/ui.cc:666
+#: src/ui.cc:667
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3658,15 +3760,15 @@
 "Aptitude ç„¡ä»»ä½•æ“”ä¿ï¼›ç´°ç¯€è«‹æŸ¥é–±æ±‚åŠ©é¸å–®çš„è¨±å¯è‰ã€‚\n"
 "æ¤è»Ÿé«”æ˜¯è‡ªç”±è»Ÿé«”ï¼Œæ¡è¿Žæ‚¨éµç…§ç‰¹å®šæ¢æ¬¾æ•£ä½ˆæ¤è»Ÿé«”ï¼›ç´°ç¯€è«‹æŸ¥é–±è¨±å¯è‰ã€‚"
 
-#: src/ui.cc:687
+#: src/ui.cc:688
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:703
+#: src/ui.cc:704
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:785
+#: src/ui.cc:786
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3674,45 +3776,45 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:799
+#: src/ui.cc:800
 #, fuzzy
 msgid "Really Continue"
 msgstr "ç¹¼çºŒ"
 
-#: src/ui.cc:801
+#: src/ui.cc:802
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:862
+#: src/ui.cc:863
 msgid "Preview of package installation"
 msgstr "é è¦½å¥—ä»¶å®‰è£"
 
-#: src/ui.cc:863
+#: src/ui.cc:864
 msgid "View and/or adjust the actions that will be performed"
 msgstr "æª¢è¦–èˆ‡/æˆ–èª¿æ•´å³å°‡åŸ·è¡Œçš„æŒ‡ä»¤"
 
-#: src/ui.cc:864
+#: src/ui.cc:865
 #, fuzzy
 msgid "Preview"
 msgstr "ä¸Šä¸€å€‹(^P)"
 
-#: src/ui.cc:900
+#: src/ui.cc:901
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "æŸäº›æ¯€æ–·çš„å¥—ä»¶å·²ç¶“è¢«ä¿®è£œï¼"
 
-#: src/ui.cc:906
+#: src/ui.cc:907
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:912
+#: src/ui.cc:913
 #, c-format
 msgid ""
 "Ran out of time while trying to resolver dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:958
+#: src/ui.cc:959
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -3721,23 +3823,23 @@
 "å®‰è£/åˆªé™¤å¥—ä»¶éœ€è¦ç®¡ç†å“¡æ¬Šé™ï¼Œè€Œæ‚¨ç¾åœ¨\n"
 "æ²’æœ‰é€™ç¨®æ¬Šé™ã€‚æ‚¨æƒ³è¦é€²å…¥ root å¸³è™Ÿå—Žï¼Ÿ\n"
 
-#: src/ui.cc:961 src/ui.cc:1077
+#: src/ui.cc:962 src/ui.cc:1078
 msgid "Become root"
 msgstr "è®Šæˆ root(^B)"
 
-#: src/ui.cc:963 src/ui.cc:1079
+#: src/ui.cc:964 src/ui.cc:1080
 msgid "Don't become root"
 msgstr "ä¸è®Šæˆ root"
 
-#: src/ui.cc:968 src/ui.cc:1084
+#: src/ui.cc:969 src/ui.cc:1085
 msgid "A package-list update or install run is already taking place."
 msgstr "å·²ç¶“é–‹å§‹äº†ä¸€å€‹å¥—ä»¶åˆ—è¡¨æ›´æ–°æˆ–è€…å®‰è£çš„å‹•ä½œã€‚"
 
-#: src/ui.cc:995
+#: src/ui.cc:996
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "æ²’æœ‰å¥—ä»¶è¢«é å®šå®‰è£ã€å‡ç´šæˆ–ç§»é™¤ã€‚"
 
-#: src/ui.cc:1001
+#: src/ui.cc:1002
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3749,7 +3851,7 @@
 "æŸäº›å¥—ä»¶å¯ä»¥è¢«å‡ç´šï¼Œä½†æ˜¯æ‚¨ä¸¦æ²’æœ‰é¸æ“‡å‡ç´šå®ƒå€‘ã€‚\n"
 "è¼¸å…¥ \"U\" ä¾†æº–å‚™å‡ç´šã€‚"
 
-#: src/ui.cc:1073
+#: src/ui.cc:1074
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -3758,99 +3860,112 @@
 "æ›´æ–°å¥—ä»¶åˆ—è¡¨éœ€è¦ç®¡ç†å“¡æ¬Šé™ï¼Œè€Œæ‚¨ç¾åœ¨\n"
 "æ²’æœ‰é€™ç¨®æ¬Šé™ã€‚æ‚¨æƒ³è¦é€²å…¥ root å¸³è™Ÿå—Žï¼Ÿ\n"
 
-#: src/ui.cc:1089 src/ui.cc:1345
+#: src/ui.cc:1090 src/ui.cc:1377
 msgid "Waste time trying to find mines"
 msgstr "çŽ©çŽ©è¸©åœ°é›·ä¾†æ¶ˆç£¨æ™‚é–“"
 
-#: src/ui.cc:1096 src/ui.cc:1149
+#: src/ui.cc:1097 src/ui.cc:1150
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "åœ¨ä¸‹è¼‰é€²è¡ŒéŽç¨‹ä¸ä¸å…è¨±åŸ·è¡Œæ¸…é™¤"
 
-#: src/ui.cc:1099
+#: src/ui.cc:1100
 msgid "Deleting downloaded files"
 msgstr "åˆªé™¤ä¸‹è¼‰çš„æª”æ¡ˆ"
 
-#: src/ui.cc:1113
+#: src/ui.cc:1114
 msgid "Downloaded package files have been deleted"
 msgstr "ä¸‹è¼‰çš„æª”æ¡ˆå·²ç¶“è¢«åˆªé™¤"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1175
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "éŽæœŸçš„ä¸‹è¼‰æª”æ¡ˆå·²ç¶“è¢«åˆªé™¤"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1247
 msgid "All solutions exhausted."
 msgstr ""
 
-#: src/ui.cc:1251 src/ui.cc:1282
+#: src/ui.cc:1252 src/ui.cc:1283
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "çŽ©çŽ©è¸©åœ°é›·ä¾†æ¶ˆç£¨æ™‚é–“"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1277
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1307
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "ç„¡æ³•æ‰“é–‹ %s ä»¥å¯«å…¥"
+
+#: src/ui.cc:1313
+msgid "Error while dumping resolver state"
+msgstr ""
+
+#: src/ui.cc:1323
+msgid "File to which the resolver state should be dumped:"
+msgstr ""
+
+#: src/ui.cc:1353
 msgid "^Install/remove packages"
 msgstr "å®‰è£/ç§»é™¤å¥—ä»¶(^I)"
 
-#: src/ui.cc:1322
+#: src/ui.cc:1354
 msgid "Perform all pending installs and removals"
 msgstr "åŸ·è¡Œæ‰€æœ‰ç‰å¾…åŸ·è¡Œçš„å®‰è£å’Œç§»é™¤ä½œæ¥"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1356
 msgid "^Update package list"
 msgstr "æ›´æ–°å¥—ä»¶åˆ—è¡¨(^U)"
 
-#: src/ui.cc:1325
+#: src/ui.cc:1357
 msgid "Check for new versions of packages"
 msgstr "æ£åœ¨æª¢æŸ¥æ–°ç‰ˆæœ¬çš„å¥—ä»¶"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1360
 msgid "^Forget new packages"
 msgstr "å¿½ç•¥æ–°å¥—ä»¶(^F)"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1361
 msgid "Forget which packages are \"new\""
 msgstr "å¿½ç•¥å“ªäº›å¥—ä»¶æ˜¯ 'æ–°' çš„"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1364
 msgid "^Clean package cache"
 msgstr "æ¸…é™¤å¥—ä»¶å¿«å–(^C)"
 
-#: src/ui.cc:1333
+#: src/ui.cc:1365
 msgid "Delete package files which were previously downloaded"
 msgstr "åˆªé™¤ä»¥å‰ä¸‹è¼‰çš„å¥—ä»¶æª”æ¡ˆ"
 
-#: src/ui.cc:1336
+#: src/ui.cc:1368
 msgid "Clean ^obsolete files"
 msgstr "é—œé–‰éŽæœŸæª”æ¡ˆ(^O)"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1369
 msgid "Delete package files which can no longer be downloaded"
 msgstr "åˆªé™¤ç„¡æ³•å†ä¸‹è¼‰çš„å¥—ä»¶æª”æ¡ˆ"
 
-#: src/ui.cc:1340
+#: src/ui.cc:1372
 msgid "Mark ^Upgradable"
 msgstr "æ¨™è¨˜ç‚ºå¯å‡ç´š(^U)"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1373
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "ç‚ºæ‰€æœ‰æœªè¢«ä¿æŒç¾ç‹€çš„å¥—ä»¶åŠ ä¸Šå‡ç´šæ¨™è¨˜"
 
-#: src/ui.cc:1344
+#: src/ui.cc:1376
 msgid "^Play Minesweeper"
 msgstr "çŽ©æŽƒé›·éŠæˆ²(^P)"
 
-#: src/ui.cc:1347
+#: src/ui.cc:1379
 msgid "^Become root"
 msgstr "è®Šæˆ root(^B)"
 
-#: src/ui.cc:1348
+#: src/ui.cc:1380
 #, fuzzy
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
@@ -3859,78 +3974,78 @@
 "åŸ·è¡Œ 'su' æˆç‚º rootã€‚é€™å°‡é‡æ–°å•Ÿå‹•ç¨‹å¼ï¼Œä½†æ˜¯æ‚¨çš„\n"
 "è¨ç½®å°‡æœƒè¢«ä¿å˜ä¸‹ä¾†ã€‚"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1383
 msgid "^Reload package cache"
 msgstr "é‡æ–°è¼‰å…¥å¥—ä»¶å¿«å–(^R)"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1384
 msgid "Reload the package cache"
 msgstr "é‡æ–°è¼‰å…¥å¥—ä»¶å¿«å–"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1390
 msgid "^Quit"
 msgstr "é€€å‡º(^Q)"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1391
 msgid "Exit the program"
 msgstr "é€€å‡ºæ¤ç¨‹åº"
 
-#: src/ui.cc:1365 src/ui.cc:1637
+#: src/ui.cc:1397 src/ui.cc:1669
 msgid "Undo"
 msgstr "å¾©åŽŸ"
 
-#: src/ui.cc:1366
+#: src/ui.cc:1398
 msgid "Undo the last package operation or group of operations"
 msgstr "å¾©åŽŸæœ€è¿‘ä¸€æ¬¡æˆ–è€…ä¸€çµ„æ“ä½œ"
 
-#: src/ui.cc:1373
+#: src/ui.cc:1405
 msgid "^Install"
 msgstr "å®‰è£(^I)"
 
-#: src/ui.cc:1374
+#: src/ui.cc:1406
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "æ¨™ç¤ºå®‰è£æˆ–å‡ç´šç¾é¸çš„å¥—ä»¶"
 
-#: src/ui.cc:1377
+#: src/ui.cc:1409
 msgid "^Remove"
 msgstr "ç§»é™¤(^R)"
 
-#: src/ui.cc:1378
+#: src/ui.cc:1410
 msgid "Flag the currently selected package for removal"
 msgstr "æ¨™ç¤ºç§»é™¤ç¾é¸çš„å¥—ä»¶"
 
-#: src/ui.cc:1381
+#: src/ui.cc:1413
 msgid "^Purge"
 msgstr "æ¸…é™¤(^P)"
 
-#: src/ui.cc:1382
+#: src/ui.cc:1414
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "æ¨™ç¤ºç§»é™¤ç¾é¸çš„å¥—ä»¶èˆ‡å…¶è¨å®šæª”"
 
-#: src/ui.cc:1385
+#: src/ui.cc:1417
 msgid "^Keep"
 msgstr "ä¿ç•™(^K)"
 
-#: src/ui.cc:1386
+#: src/ui.cc:1418
 msgid "Cancel any action on the selected package"
 msgstr "å–æ¶ˆé¸æ“‡çš„å¥—ä»¶ä¸Šçš„ä»»ä½•å‹•ä½œ"
 
-#: src/ui.cc:1389
+#: src/ui.cc:1421
 msgid "^Hold"
 msgstr "ä¿ç•™(^H)"
 
-#: src/ui.cc:1390
+#: src/ui.cc:1422
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "å–æ¶ˆåœ¨é¸æ“‡å¥—ä»¶çš„ä»»ä½•æŒ‡ä»¤ï¼Œä¸¦ä¿è‰æœªä¾†ä¹Ÿä¸å‡ç´š"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1425
 msgid "Mark ^Auto"
 msgstr "æ¨™ç¤ºç‚ºè‡ªå‹•(^A)"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1426
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -3939,11 +4054,11 @@
 "æ¨™ç¤ºè‡ªå‹•å®‰è£é¸æ“‡çš„å¥—ä»¶;\n"
 "å¦‚æžœæ²’æœ‰å…¶ä»–å¥—ä»¶ç›¸ä¾æ–¼ä¸Šï¼Œå®ƒå°‡æœƒè¢«è‡ªå‹•ç§»é™¤"
 
-#: src/ui.cc:1397
+#: src/ui.cc:1429
 msgid "Mark ^Manual"
 msgstr "æ¨™ç¤ºç‚ºæ‰‹å‹•è™•ç†(^M)"
 
-#: src/ui.cc:1398
+#: src/ui.cc:1430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -3952,11 +4067,11 @@
 "æ¨™ç¤ºæ‰‹å‹•å®‰è£é¸æ“‡çš„å¥—ä»¶;\n"
 "é™¤éžæ‚¨æ‰‹å‹•ç§»é™¤ï¼Œå¦å‰‡å®ƒå°‡ä¸æœƒè¢«ç§»é™¤"
 
-#: src/ui.cc:1401
+#: src/ui.cc:1433
 msgid "^Forbid Version"
 msgstr "ç¦åˆ¶ç‰ˆæœ¬(^F)"
 
-#: src/ui.cc:1402
+#: src/ui.cc:1434
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -3965,214 +4080,214 @@
 "ç¦åˆ¶å®‰è£é¸æ“‡å¥—ä»¶çš„å€™é¸ç‰ˆæœ¬;\n"
 "æ–°ç‰ˆæœ¬çš„å¥—ä»¶å°‡æœƒåƒå¾€å¸¸ä¸€æ¨£è¢«å®‰è£"
 
-#: src/ui.cc:1406
+#: src/ui.cc:1438
 msgid "I^nformation"
 msgstr "è³‡è¨Š(^n)"
 
-#: src/ui.cc:1407
+#: src/ui.cc:1439
 msgid "Display more information about the selected package"
 msgstr "é¡¯ç¤ºé¸æ“‡çš„å¥—ä»¶ä¹‹ç´°ç¯€è³‡è¨Š"
 
-#: src/ui.cc:1410
+#: src/ui.cc:1442
 msgid "^Changelog"
 msgstr "è®Šæ›´ç´€éŒ„(^C)"
 
-#: src/ui.cc:1411
+#: src/ui.cc:1443
 msgid "Display the Debian changelog of the selected package"
 msgstr "é¡¯ç¤ºé¸æ“‡å¥—ä»¶çš„ Debian æ›´æ”¹ç´€éŒ„"
 
-#: src/ui.cc:1418
+#: src/ui.cc:1450
 msgid "^Find"
 msgstr "å°‹æ‰¾(^F)"
 
-#: src/ui.cc:1419
+#: src/ui.cc:1451
 msgid "Search for a package"
 msgstr "æœå°‹å¥—ä»¶"
 
-#: src/ui.cc:1422
+#: src/ui.cc:1454
 msgid "Find ^Again"
 msgstr "é‡æ–°å°‹æ‰¾(^A)"
 
-#: src/ui.cc:1423
+#: src/ui.cc:1455
 msgid "Repeat the last search"
 msgstr "é‡è¤‡æœ€å¾Œå°‹æ‰¾"
 
-#: src/ui.cc:1427
+#: src/ui.cc:1459
 msgid "^Limit Display"
 msgstr "é™åˆ¶é¡¯ç¤º(^L)"
 
-#: src/ui.cc:1428
+#: src/ui.cc:1460
 msgid "Apply a filter to the package list"
 msgstr "å¥—ç”¨å¥—ä»¶åˆ—è¡¨ç¯©é¸"
 
-#: src/ui.cc:1431
+#: src/ui.cc:1463
 msgid "^Un-Limit Display"
 msgstr "ç„¡é™åˆ¶é¡¯ç¤º(^U)"
 
-#: src/ui.cc:1432
+#: src/ui.cc:1464
 msgid "Remove the filter from the package list"
 msgstr "ç§»é™¤å¥—ä»¶åˆ—è¡¨çš„ç¯©é¸"
 
-#: src/ui.cc:1436
+#: src/ui.cc:1468
 msgid "Find ^Broken"
 msgstr "æœå°‹æå£žå¥—ä»¶(^B)"
 
-#: src/ui.cc:1437
+#: src/ui.cc:1469
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "å°‹æ‰¾ä¸‹å€‹æœªæ»¿è¶³ç›¸ä¾æ€§çš„å¥—ä»¶"
 
-#: src/ui.cc:1444
+#: src/ui.cc:1476
 msgid "^UI options"
 msgstr "ç”¨æˆ¶ç•Œé¢é¸é …(^U)"
 
-#: src/ui.cc:1445
+#: src/ui.cc:1477
 msgid "Change the settings which affect the user interface"
 msgstr "ä¿®æ”¹å½±éŸ¿ç”¨æˆ¶ç•Œé¢çš„è¨ç½®"
 
-#: src/ui.cc:1448
+#: src/ui.cc:1480
 msgid "^Dependency handling"
 msgstr "è™•ç†ä¾è³´é—œä¿‚(^D)"
 
-#: src/ui.cc:1449
+#: src/ui.cc:1481
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "æ”¹è®Šå½±éŸ¿è™•ç†ä¾è³´é—œä¿‚çš„è¨ç½®"
 
-#: src/ui.cc:1452
+#: src/ui.cc:1484
 msgid "^Miscellaneous"
 msgstr "é›œé …(^M)"
 
-#: src/ui.cc:1453
+#: src/ui.cc:1485
 msgid "Change miscellaneous program settings"
 msgstr "æ”¹è®Šç¨‹åºçš„é›œé …è¨ç½®"
 
-#: src/ui.cc:1458
+#: src/ui.cc:1490
 msgid "^Revert options"
 msgstr "é‚„åŽŸé¸é …(^R)"
 
-#: src/ui.cc:1459
+#: src/ui.cc:1491
 msgid "Reset all settings to the system defaults"
 msgstr "æŠŠæ‰€æœ‰é …ç›®é‡è¨ç‚ºå®ƒå€‘çš„é è¨å€¼"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1502
 msgid "^Next"
 msgstr "ä¸‹ä¸€å€‹(^N)"
 
-#: src/ui.cc:1471
+#: src/ui.cc:1503
 msgid "View next display"
 msgstr "æŸ¥çœ‹ä¸‹ä¸€å€‹ç•«é¢"
 
-#: src/ui.cc:1474
+#: src/ui.cc:1506
 msgid "^Prev"
 msgstr "ä¸Šä¸€å€‹(^P)"
 
-#: src/ui.cc:1475
+#: src/ui.cc:1507
 msgid "View previous display"
 msgstr "æŸ¥çœ‹ä¸Šä¸€ç•«é¢"
 
-#: src/ui.cc:1478
+#: src/ui.cc:1510
 msgid "^Close"
 msgstr "é—œé–‰(^C)"
 
-#: src/ui.cc:1479
+#: src/ui.cc:1511
 msgid "Close this display"
 msgstr "é—œé–‰æ¤ç•«é¢"
 
-#: src/ui.cc:1484
+#: src/ui.cc:1516
 msgid "New Package ^View"
 msgstr "æ–°å¥—ä»¶è¦–é‡Ž(^V)"
 
-#: src/ui.cc:1485
+#: src/ui.cc:1517
 msgid "Create a new default package view"
 msgstr "å»ºç«‹æ–°çš„é è¨å¥—ä»¶è¦–é‡Ž"
 
-#: src/ui.cc:1488
+#: src/ui.cc:1520
 msgid "New Categorical ^Browser"
 msgstr "æ–°åˆ†é¡žç€è¦½å™¨(^B)"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1522
 msgid "Browse packages by category"
 msgstr "åˆ†é¡žç€è¦½å¥—ä»¶"
 
-#: src/ui.cc:1498
+#: src/ui.cc:1530
 msgid "^About"
 msgstr "é—œæ–¼(^A)"
 
-#: src/ui.cc:1499
+#: src/ui.cc:1531
 msgid "View information about this program"
 msgstr "æŸ¥çœ‹é—œæ–¼æ¤ç¨‹å¼çš„è³‡è¨Š"
 
-#: src/ui.cc:1502
+#: src/ui.cc:1534
 msgid "^Help"
 msgstr "æ±‚åŠ©(^H)"
 
-#: src/ui.cc:1503
+#: src/ui.cc:1535
 msgid "View the on-line help"
 msgstr "æŸ¥çœ‹ç·šä¸Šæ±‚åŠ©"
 
-#: src/ui.cc:1505
+#: src/ui.cc:1537
 msgid "User's ^Manual"
 msgstr "ç”¨æˆ¶æ‰‹å†Š(^M)"
 
-#: src/ui.cc:1506
+#: src/ui.cc:1538
 msgid "View the detailed program manual"
 msgstr "ç€è¦½è©³ç´°çš„ä½¿ç”¨æ‰‹å†Š"
 
-#: src/ui.cc:1509
+#: src/ui.cc:1541
 msgid "^FAQ"
 msgstr "å¸¸è¦‹å•é¡Œ(^F)"
 
-#: src/ui.cc:1510
+#: src/ui.cc:1542
 msgid "View a list of frequently asked questions"
 msgstr "ç€è¦½å¸¸è¦‹å•é¡Œåˆ—è¡¨"
 
-#: src/ui.cc:1513
+#: src/ui.cc:1545
 msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1514
+#: src/ui.cc:1546
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "æŸ¥çœ‹æ¤ç¨‹å¼æ¯ä¸€ç‰ˆæœ¬ä¸æ‰€åšçš„é‡å¤§ä¿®æ”¹"
 
-#: src/ui.cc:1517
+#: src/ui.cc:1549
 msgid "^License"
 msgstr "è¨±å¯è‰(^L)"
 
-#: src/ui.cc:1518
+#: src/ui.cc:1550
 msgid "View the terms under which you may copy the program"
 msgstr "æŸ¥çœ‹æ‚¨å¯ä»¥åœ¨ä½•ç¨®æ¢æ¬¾ä¸‹é‡è£½è©²ç¨‹å¼"
 
-#: src/ui.cc:1636
+#: src/ui.cc:1668
 msgid "Actions"
 msgstr "å‹•ä½œ"
 
-#: src/ui.cc:1639
+#: src/ui.cc:1671
 msgid "Search"
 msgstr "æœå°‹"
 
-#: src/ui.cc:1640
+#: src/ui.cc:1672
 msgid "Options"
 msgstr "é¸é …"
 
-#: src/ui.cc:1641
+#: src/ui.cc:1673
 msgid "Views"
 msgstr "æŸ¥çœ‹"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1674
 msgid "Help"
 msgstr "æ±‚åŠ©"
 
-#: src/ui.cc:1699
+#: src/ui.cc:1734
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr "%sï¼šé¸å–®  %sï¼šæ±‚åŠ©  %sï¼šé€€å‡º  %sï¼šæ›´æ–°  %sï¼šä¸‹è¼‰/å®‰è£å¥—ä»¶"
 
-#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
+#: src/ui.cc:2003 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ç¢ºå®šéµ"
 
-#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
+#: src/ui.cc:2004 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "å¦å®šéµ"
 
@@ -4214,13 +4329,54 @@
 msgid "Ouch!  Got SIGQUIT, dying..\n"
 msgstr "å“Žå”·! å¾—åˆ° SIGQUIT, åž‚æ»ä¸..\n"
 
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "Yes"
-msgstr "æ˜¯(Y)"
-
-#: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
-msgid "No"
-msgstr "å¦(N)"
+#~ msgid ""
+#~ "Commands:\n"
+#~ "  y: continue with the installation\n"
+#~ "  n: abort and quit\n"
+#~ "  i: show information about one or more packages;\n"
+#~ "     the package names should follow 'i'\n"
+#~ "  c: show the Debian changelogs of one or more packages;\n"
+#~ "     the package names should follow 'c'\n"
+#~ "  d: toggle display of dependency information\n"
+#~ "  s: toggle display of changes in package sizes\n"
+#~ "  v: toggle display of versions\n"
+#~ "  e: enter the full visual interface\n"
+#~ "\n"
+#~ "  You may also specify modifications to the set of package actions.\n"
+#~ "  To do so, type an action character followed by one or more package "
+#~ "names\n"
+#~ "or patterns.  The action will be applied to all packages. (you may "
+#~ "specify\n"
+#~ "additional actions; each will be applied to all packages that follow it)\n"
+#~ "\n"
+#~ "Actions:\n"
+#~ "  + : Install\n"
+#~ "  - : Remove\n"
+#~ "  _ : Purge\n"
+#~ "  = : Hold\n"
+#~ msgstr ""
+#~ "å‘½ä»¤:\n"
+#~ "  y: ç¹¼çºŒå®‰è£\n"
+#~ "  n: çµ‚æ¢ä¸¦é€€å‡º\n"
+#~ "  d: é¡¯ç¤ºç›¸ä¾è¨Šæ¯\n"
+#~ "  i: é¡¯ç¤ºä¸€å€‹ä»¥ä¸Šå¥—ä»¶è³‡è¨Š;\n"
+#~ "     å¥—ä»¶åç¨±æ‡‰è©²æŽ’åœ¨ 'i' ä¹‹å¾Œ\n"
+#~ "  c: é¡¯ç¤ºä¸€å€‹ä»¥ä¸Šå¥—ä»¶çš„ Debian æ›´æ”¹ç´€éŒ„;\n"
+#~ "     å¥—ä»¶åç¨±æ‡‰è©²æŽ’åœ¨ 'c' ä¹‹å¾Œ\n"
+#~ "  s: é¡¯ç¤ºå¥—ä»¶è®Šæ›´å¤§å°\n"
+#~ "  v: é¡¯ç¤ºç‰ˆæœ¬\n"
+#~ "  e: é€²å…¥å…¨è¦–é‡Žä»‹é¢\n"
+#~ "\n"
+#~ "  æ‚¨ä¹Ÿå¯ä»¥æŒ‡å®šå°å¥—ä»¶çµ„é€²è¡Œç‰¹å®šæŒ‡ä»¤è™•ç†ã€‚\n"
+#~ "  è¦é€™éº¼ä½œï¼Œè«‹è¼¸å…¥ä»¥ä¸‹å—å…ƒå¾Œä¸¦è¼¸å…¥å¥—ä»¶åç¨±æˆ–æ¨£å¼ã€‚\n"
+#~ "å‹•ä½œæœƒå¥—ç”¨åœ¨æ‰€æœ‰å¥—ä»¶ä¸Š(æ‚¨æˆ–è¨±å¯ä»¥æŒ‡å®šé¡å¤–æŒ‡ä»¤;æ¯å€‹æŒ‡ä»¤éƒ½æœƒå¥—ç”¨åœ¨æ‰€æœ‰å¯«åœ¨å…¶"
+#~ "å¾Œçš„å¥—ä»¶ä¸Š)\n"
+#~ "\n"
+#~ "æŒ‡ä»¤:\n"
+#~ "  + : å®‰è£\n"
+#~ "  - : ç§»é™¤\n"
+#~ "  _ : æ¸…é™¤\n"
+#~ "  = : ä¿ç•™\n"
 
 #~ msgid ""
 #~ "Some packages had unmet dependencies.  This may mean that you have\n"

