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

Daniel Burrows dburrows at costa.debian.org
Mon Jul 18 15:58:14 UTC 2005


Author: dburrows
Date: Sat Apr 30 13:41:32 2005
New Revision: 3192

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/po/POTFILES.in
   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/tr.po
   branches/aptitude-0.3/aptitude/po/zh_CN.po
   branches/aptitude-0.3/aptitude/po/zh_TW.po
Log:
pofile updates

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 30 13:41:32 2005
@@ -1,5 +1,10 @@
 2005-04-29  Daniel Burrows  <dburrows at debian.org>
 
+	* po/POTFILES.in, po/*.po:
+
+	  Update POTFILES (oops, forgot to do that for a while) and run
+	  'make update-po'.
+
 	* src/cmdline/cmdline_resolver.cc:
 
 	  Be less strict about obeying command-line instructions, to avoid

Modified: branches/aptitude-0.3/aptitude/po/POTFILES.in
==============================================================================
--- branches/aptitude-0.3/aptitude/po/POTFILES.in	(original)
+++ branches/aptitude-0.3/aptitude/po/POTFILES.in	Sat Apr 30 13:41:32 2005
@@ -5,6 +5,8 @@
 src/aptitude.h
 src/apt_options.cc
 src/apt_options.h
+src/broken_indicator.cc
+src/broken_indicator.h
 src/cmdline/cmdline_action.cc
 src/cmdline/cmdline_action.h
 src/cmdline/cmdline_changelog.cc
@@ -16,6 +18,8 @@
 src/cmdline/cmdline_do_action.h
 src/cmdline/cmdline_download.cc
 src/cmdline/cmdline_download.h
+src/cmdline/cmdline_dump_resolver.cc
+src/cmdline/cmdline_dump_resolver.h
 src/cmdline/cmdline_forget_new.cc
 src/cmdline/cmdline_forget_new.h
 src/cmdline/cmdline_moo.cc
@@ -24,6 +28,8 @@
 src/cmdline/cmdline_progress.h
 src/cmdline/cmdline_prompt.cc
 src/cmdline/cmdline_prompt.h
+src/cmdline/cmdline_resolver.cc
+src/cmdline/cmdline_resolver.h
 src/cmdline/cmdline_search.cc
 src/cmdline/cmdline_search.h
 src/cmdline/cmdline_show_broken.cc
@@ -68,6 +74,8 @@
 src/generic/apt.h
 src/generic/aptitudepolicy.cc
 src/generic/aptitudepolicy.h
+src/generic/aptitude_resolver.cc
+src/generic/aptitude_resolver.h
 src/generic/apt_undo_group.cc
 src/generic/apt_undo_group.h
 src/generic/config_signal.cc
@@ -83,6 +91,8 @@
 src/generic/pkg_hier.cc
 src/generic/pkg_hier_dump.cc
 src/generic/pkg_hier.h
+src/generic/problemresolver/problemresolver.h
+src/generic/problemresolver/test.cc
 src/generic/rev_dep_iterator.h
 src/generic/strhash.h
 src/generic/tasks.cc
@@ -126,6 +136,10 @@
 src/pkg_view.h
 src/reason_fragment.cc
 src/reason_fragment.h
+src/solution_dialog.cc
+src/solution_dialog.h
+src/solution_fragment.cc
+src/solution_fragment.h
 src/strhash.h
 src/trust.cc
 src/trust.h
@@ -144,6 +158,8 @@
 src/vscreen/config/keybindings.h
 src/vscreen/curses++.cc
 src/vscreen/curses++.h
+src/vscreen/fragment_cache.cc
+src/vscreen/fragment_cache.h
 src/vscreen/fragment.cc
 src/vscreen/fragment_contents.h
 src/vscreen/fragment.h

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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +147,99 @@
 msgstr ""
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr ""
 
 #: 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:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr ""
 
+#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
+msgid "Internal error: unexpected null solution."
+msgstr ""
+
+#: src/broken_indicator.cc:158
+msgid "Suggest "
+msgstr ""
+
+#: src/broken_indicator.cc:164
+#, c-format
+msgid "%d installs"
+msgstr ""
+
+#: src/broken_indicator.cc:169
+msgid "1 install"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "%d upgrades"
+msgstr ""
+
+#: src/broken_indicator.cc:196
+msgid "1 upgrade"
+msgstr ""
+
+#: src/broken_indicator.cc:200
+#, c-format
+msgid "%d downgrades"
+msgstr ""
+
+#: src/broken_indicator.cc:205
+msgid "1 downgrade"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "%s: Next"
+msgstr ""
+
+#: 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 ""
@@ -220,48 +303,48 @@
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
 #, 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:283
+#: src/cmdline/cmdline_action.cc:268
 #, 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:307
+#: src/cmdline/cmdline_action.cc:292
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
 #, 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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -302,13 +385,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: 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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr ""
@@ -318,7 +401,7 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr ""
 
@@ -380,191 +463,193 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are unused and will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, 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:328
+#: src/cmdline/cmdline_prompt.cc:332
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+msgid "Press Return to continue"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -572,7 +657,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -580,7 +665,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -588,7 +673,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -596,7 +681,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -604,7 +689,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -612,7 +697,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -639,27 +724,78 @@
 "  = : Hold\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_resolver.cc:84
 #, c-format
-msgid "search: You must provide at least one search term\n"
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+msgid "give up and quit the program"
 msgstr ""
 
-#: src/cmdline/cmdline_show_broken.cc:114
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+msgid "The following actions will resolve these dependencies:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+msgid "The following commands are available:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:188
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
+#: src/cmdline/cmdline_search.cc:78
 #, 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 ""
 
-#: 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 ""
@@ -857,12 +993,12 @@
 msgid "Description: "
 msgstr ""
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr ""
 
@@ -904,26 +1040,24 @@
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr ""
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr ""
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr ""
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr ""
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr ""
 
@@ -931,7 +1065,7 @@
 msgid "Couldn't read list of package sources"
 msgstr ""
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr ""
 
@@ -943,29 +1077,33 @@
 msgid "View the progress of the package list update"
 msgstr ""
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr ""
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr ""
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr ""
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -973,77 +1111,77 @@
 "\n"
 msgstr ""
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr ""
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr ""
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr ""
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr ""
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr ""
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr ""
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr ""
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr ""
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr ""
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr ""
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr ""
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr ""
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr ""
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr ""
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr ""
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr ""
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1051,32 +1189,36 @@
 "Log complete.\n"
 msgstr ""
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr ""
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr ""
 
-#: src/download.cc:352
+#: src/download.cc:332
+msgid "Package Download"
+msgstr ""
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr ""
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr ""
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1136,11 +1278,6 @@
 msgid "[ERROR]"
 msgstr ""
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr ""
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1178,109 +1315,109 @@
 "press enter\n"
 msgstr ""
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr ""
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr ""
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr ""
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr ""
 
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr ""
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr ""
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr ""
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr ""
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr ""
 
@@ -1301,7 +1438,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr ""
 
-#: 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 ""
@@ -1501,292 +1638,300 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
 msgstr ""
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:94
+#: src/main.cc:93
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:95
+#: src/main.cc:94
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/main.cc:114
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:120
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:121
+#: src/main.cc:120
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:122
+#: src/main.cc:121
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:123
+#: src/main.cc:122
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:123
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:125
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:125
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:127
+#: src/main.cc:126
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/main.cc:129
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:254
+#: src/main.cc:253
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:318
+#: src/main.cc:317
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:326
+#: src/main.cc:325
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:337
+#: src/main.cc:342
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
 #: src/mine/cmine.cc:93
@@ -1815,7 +1960,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr ""
 
@@ -1989,7 +2134,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr ""
 
@@ -2237,8 +2382,8 @@
 " 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 ""
 
 #: src/pkg_grouppolicy.cc:159
@@ -2531,9 +2676,9 @@
 " 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"
@@ -2582,8 +2727,8 @@
 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 ""
 
 #: src/pkg_grouppolicy.cc:321
@@ -2777,93 +2922,111 @@
 msgid "Versions"
 msgstr ""
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr ""
 
 #: src/pkg_item.cc:80
 #, 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 ""
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr ""
 
-#: src/pkg_item.cc:304
-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:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:310
+#, c-format
+msgid "Available versions of %s"
+msgstr ""
+
+#: src/pkg_item.cc:313
+#, c-format
+msgid "%s versions"
+msgstr ""
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr ""
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 ""
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 ""
 
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
 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 ""
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr ""
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr ""
 
+#: src/pkg_item.cc:447
+msgid "Hierarchy Editor"
+msgstr ""
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr ""
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr ""
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr ""
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr ""
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr ""
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr ""
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr ""
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
@@ -2877,7 +3040,7 @@
 msgid "make_package_view: bad argument!"
 msgstr ""
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr ""
 
@@ -3065,6 +3228,66 @@
 "broken if it is %s."
 msgstr ""
 
+#: src/solution_dialog.cc:74
+msgid "The package cache is not available."
+msgstr ""
+
+#: src/solution_dialog.cc:82
+msgid "No packages are broken."
+msgstr ""
+
+#: 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
+msgid "Previous"
+msgstr ""
+
+#: src/solution_dialog.cc:147
+msgid "Next"
+msgstr ""
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+msgid "Close"
+msgstr ""
+
+#: src/solution_fragment.cc:125
+msgid "%BRemove%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:135
+msgid "%BInstall%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:148
+msgid "%BKeep%b the following packages at their current version:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:161
+msgid "%BUpgrade%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:176
+msgid "%BDowngrade%b the following packages:%n"
+msgstr ""
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3076,52 +3299,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr ""
 
-#: src/ui.cc:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr ""
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr ""
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 
-#: src/ui.cc:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr ""
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr ""
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 msgid "View available packages and choose actions to perform"
 msgstr ""
 
-#: src/ui.cc:599
+#: src/ui.cc:666
 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 "
@@ -3129,15 +3352,15 @@
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr ""
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr ""
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3145,458 +3368,477 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
+#: src/ui.cc:900
+msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:912
+#, c-format
 msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have.  Would you like to change to the root account?\n"
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
 msgstr ""
 
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:958
+msgid ""
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have.  Would you like to change to the root account?"
+msgstr ""
+
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
 "upgrade."
 msgstr ""
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
 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 ""
 
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+msgid "Ran out of time while trying to find a solution."
+msgstr ""
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
 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 ""
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
 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 ""
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
 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 ""
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
 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 ""
 
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr ""
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr ""
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr ""
 
@@ -3608,6 +3850,15 @@
 msgid "Downloading Changelog"
 msgstr ""
 
+#: src/view_changelog.cc:54
+msgid "Download Changelog"
+msgstr ""
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"

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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +149,103 @@
 msgstr "إزالة الحزم الغير مستخدمة والتي توافق عامل التصفية تلقائياً"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "موافق"
 
 #: 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:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "إلغاء"
 
+#: 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 "يقترح"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "تثبيت"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "تثبيت"
+
+#: 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 "ترقية"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "ترقية"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "مثبط"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "مثبط"
+
+#: 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 "^تالي"
+
+#: 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 ""
@@ -230,22 +317,22 @@
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "الحزمة %s غير قابلة للترقية، لا يمكن منع الترقية\n"
 
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "ملاحظة: تحديد المهمة \"%s: %s\" للتثبيت\n"
 
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr "يمكنك تحديد نسخة حزمة فقط مع أمر التثبيت 'install'\n"
 
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr "يمكنك تحديد أرشيف حزمة فقط مع أمر التثبيت 'install'\n"
 
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -254,7 +341,7 @@
 "لم يمكن العثور على \"%s\"، وأكثر من 40\n"
 "حزمة تحتوي %s\" في اسمها.\n"
 
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -263,12 +350,12 @@
 "لم يمكن العثور على \"%s\".  على كلّ، الحزمة\n"
 "التالية تحتوي %s\" في اسمها:\n"
 
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "لم يمكن العثور على أيّة حزمة يطابق اسمها أو وصفها \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -277,7 +364,7 @@
 "لم يمكن العثور على أيّة حزمة تطابق \"%s\"، وأكثر من 40\n"
 "حزمة تحتوي %s\" في وصفها.\n"
 
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -320,13 +407,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "سوف يفرغ %sبايت من مساحة القرص"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "عملية غير صالحة %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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "إجهاض.\n"
@@ -336,7 +423,7 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr "التنزيل: يجب تحديد حزمة واحدة على الأقل لتنزيلها\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "تعذرت قراءة لائحة المصادر"
 
@@ -398,95 +485,95 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "ما الأمر؟  إنّه فيلٌ التهمه ثعبان بالطبع.\n"
 
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "تعذرت قراءة لائحة المصادر"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "إلا أنه يجب تثبيت %s."
 
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "إلا أنّ %s مثبتة."
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "إلا أنّها غير قابلة للتثبيت"
 
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " والتي هي حزمة وهمية."
 
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " أو"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "الحزمة التالية معطوبة:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "الحزم التالية غير مستخدمة وسوف تزال:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "تمّ إبقاء الحزمة التالية تلقائياً:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr "الحزم الجديدة التالية سوف تُثبت تلقائياً:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "سيتم إزالة الحزم التالية تلقائياً:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr "سيتم تثبيط الحزم التالية:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr "تم إبقاء الحزم التالية:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "سيعاد تثبيت الحزم التالية:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "سيتم إزالة الحزم التالية:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "ستتم ترقية الحزم التالية:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "الحزم الأساسيّة التالية سيتم إزالتها!\n"
 
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "ستصبح الحزم الأساسية التالية معطوبة بسبب هذا العمل:\n"
 
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -495,96 +582,99 @@
 "تحذير: إجراء هذا العمل سيتسبب على الأرجح بإعطاب نظامك!\n"
 "         لا تُكمل ما لم تكن متأكّداً مما تقوم به بالضبط!\n"
 
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
 msgid "I am aware that this is a very bad idea"
 msgstr "أعلم أن هذه فكرة سيئة جداً"
 
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "للاستمرار، اكتب الجملة \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "الحزم التالية مقترحة ولكن لن يتم تثبيتها:\n"
 
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "الحزم التالية مقترحة ولكن لن يتم تثبيتها:\n"
 
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "لن يتم تثبيت، أو ترقية، أو إزالة أية حزم.\n"
 
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu حزمة تمت ترقيتها، و%lu حزمة جديدة تم تثبيتها، "
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu تمت إعادة تثبيتها، "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu تم تثبيطها، "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu سيتم إزالتها و %lu لم يتم ترقيتها.\n"
 
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "نحتاج إلى جلب %sب/%sب من الأرشيف. "
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "يجب جلب %sب من الأرشيف. "
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "فك فك التغليف سيستخدم %sب.\n"
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "فك فك التغليف سيفرغ %sب.\n"
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "حرف عمل سيء '%c'\n"
 
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "إضغط زر الإدخال للاستمرار."
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "لم يعثر على أية حزم -- أدخل أسماء الحزم على السطر بعد 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "إضغط زر الإدخال للاستمرار."
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "هل تريد الاستمرار؟ [ن/ل/؟]"
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -595,7 +685,7 @@
 "سوف تظهر معلومات المعتمدات.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -606,7 +696,7 @@
 "لن تظهر معلومات المعتمدات.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -617,7 +707,7 @@
 "ستظهر معلومات النسخة.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -628,7 +718,7 @@
 "لن تظهر معلومات النسخة.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -639,7 +729,7 @@
 "ستظهر تغييرات الحجم.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -650,7 +740,7 @@
 "لن تظهر تغييرات الحجم.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
@@ -697,32 +787,83 @@
 "  _ : Purge\n"
 "  = : Hold\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "ردّ غير صالح.  رجاء أدخل أمراً صالحاً أ '؟' للمساعدة.\n"
 
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "الخروج من البرنامج"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "الحزم التالية لها معتمدات غير متوفرة:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "الحزمة التالية معطوبة:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr "ردّ غير صالح.  رجاء أدخل أمراً صالحاً أ '؟' للمساعدة.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr "ردّ غير صالح.  رجاء أدخل أمراً صالحاً أ '؟' للمساعدة.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "البحث: يجب أن تعطي كلمة بحث واحدة على الأقل\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 ""
-"كان لبعض الحزم معتمدات غير متوفرة.  قد يعني هذا أنّك\n"
-"طلبت وضعاً مستحيلاً أو إن كنت تستخدم توزيعة\n"
-"unstable فذلك يعني أن بعض الحزم المطلوبة لم تُنشأ\n"
-"بعد أو أنه تمت إزالتها من الوارد.\n"
-"\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 "الحزم التالية لها معتمدات غير متوفرة:\n"
@@ -920,12 +1061,12 @@
 msgid "Description: "
 msgstr "الوصف: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "سيقوم بتنزيل/تثبيت/إزالة الحزم.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 #, fuzzy
 msgid "Internal Error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم ينته الترتيب"
@@ -968,28 +1109,24 @@
 msgid "UNAVAILABLE"
 msgstr "غير متوفر"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 ""
-"رجاء أدخل القرص التالي في السواقة \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "رجاء إدخال القرص المُعنون \"%s\" في السواقة \"%s\""
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "زيارة "
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "تحميل "
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "حُصل على "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "جاري التحميل..."
 
@@ -997,7 +1134,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "تعذرت قراءة لائحة مصادر الحزم"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "لم يمكن قفل دليل اللائحة... أأنت مستخدم جذر؟"
 
@@ -1009,29 +1146,33 @@
 msgid "View the progress of the package list update"
 msgstr "عرض سريان تحديث لائحة الحزم"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "لم يمكن تنظيف أدلة اللوائح"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "حذف الملفات المنزلة الملغاة"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "حذف الملفات المنزلة الملغاة\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "لم يمكن فتح %s لتسجيل الأعمال"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "تقرير التسجيل"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1039,77 +1180,77 @@
 "\n"
 msgstr ""
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "سيثبّت %li حزمة، ويزيل %li حزمة.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "%s بايت من مساحة القرص سيتم استخدامها\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "%s بايت من مساحة القرص سيتم إفراغها\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[ترقية] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[تثبيط] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "إزالة"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "تثبيت"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "إعادة تثبيت"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "إمساك"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "معطوب"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "إزالة، غير مستخدم"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "إزالة، معتمدات"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "تثبيت، معتمدات"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "إمساك، معتمدات"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1120,32 +1261,37 @@
 "\n"
 "اكتمل التسجيل.\n"
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "تنزيل الحزم"
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "عرض سريان تحميل الحزم"
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "الحزمة: "
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "خطأ داخلي: لم يمكن توليد لائحة الحزم المطلوب تنزيلها"
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr ""
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "اضغط مفتاح الإدخال للاستمرار.\n"
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1205,11 +1351,6 @@
 msgid "[ERROR]"
 msgstr "[خطأ]"
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "رجاء إدخال القرص المُعنون \"%s\" في السواقة \"%s\""
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1248,109 +1389,109 @@
 msgstr ""
 "تغيير الوسط: رجاء إدخال القرص المعنون '%s' في السواقة '%s' وضغط زر الإدخال\n"
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "تعذر فتح ملف وضع Aptitude التفصيلي"
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "قراءة معلومات الوضع التفصيلية"
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr ""
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "تعذر فتح ملف وضع Aptitude"
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "كتابة معلومات الوضع التفصيلية"
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "تعذرت كتابة ملف الوضع"
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "خطأ في كتابة ملف الوضع"
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "تعذر استبدال ملف الوضع القديم"
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "لم يمكن تصحيح المعتمدات، لذا لن يمكن تثبيت بعض الحزم"
 
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة لائحة المصادر."
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "لوائح الحزم أو ملف الوضع لم يمكن إعرابه أو فتحه."
 
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
 msgid "You may want to update the package lists to correct these missing files"
 msgstr "قد ترغب بتحديث لوائح الحزم لتصحيح هذه الملفات المفقودة"
 
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "تعذر فتح %s للكتابة"
 
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "تعذر استبدال %s بملف التهيئة الجديد"
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "'(' غير مُطابق"
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "نوع معتمد مجهول: %s"
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "نوع عمل مجهول: %s"
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "أولوية مجهولة %s"
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "نوع صيغة مجهول: %c"
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "صيغة فارغة غير متوقعة"
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "صيغة مشكلة بشكل سيء"
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "')' غير متوقع"
 
@@ -1373,7 +1514,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "لا يمكن الحصول على قيمة $HOME، استخدام TMPDIR (غير آمن)"
 
-#: 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 "سجل تغييرات %s"
@@ -1573,292 +1714,300 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
 msgstr ""
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:94
+#: src/main.cc:93
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:95
+#: src/main.cc:94
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/main.cc:114
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:120
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:121
+#: src/main.cc:120
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:122
+#: src/main.cc:121
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:123
+#: src/main.cc:122
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:123
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:125
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:125
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:127
+#: src/main.cc:126
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/main.cc:129
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:254
+#: src/main.cc:253
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:318
+#: src/main.cc:317
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:326
+#: src/main.cc:325
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:337
+#: src/main.cc:342
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
 #: src/mine/cmine.cc:93
@@ -1887,7 +2036,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr ""
 
@@ -2061,7 +2210,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr "حزمة"
 
@@ -2309,8 +2458,8 @@
 " 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 ""
 
 #: src/pkg_grouppolicy.cc:159
@@ -2603,9 +2752,9 @@
 " 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"
@@ -2658,11 +2807,12 @@
 " تتوفر نسخة أجدد من هذه الحزم."
 
 #: 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 ""
 "الحزم الجديدة\n"
 " تمت إضافة هذه الحزمة إلى دبيان منذ المرة الأخيرة التي مسحت بها لائحة الحزم "
@@ -2895,101 +3045,121 @@
 msgid "Versions"
 msgstr "النسخ"
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "نعم، أنا على علم بأن هذه فكرة سيئة جداً"
 
 #: src/pkg_item.cc:80
-#, c-format
+#, 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 هي حزمة أساسية!\n"
 "\n"
 "هل أنت متأكّد من أنك تريد إزالتها؟\n"
 "اطبع '%s' إن كنت كذلك."
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "معلومات حول %s"
 
-#: src/pkg_item.cc:304
-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 "النسخ المتوفرة من"
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "النسخ"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "معتمدات %s"
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 "الحزم التي تعتمد على %s"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 "جاري تقرير خليل في %s:\n"
 
-#: src/pkg_item.cc:395
+#: 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 ""
 "أنت لست الجذر ولا يمكن العثور على أية طريقة\n"
 "لتصبح الجذر.  كي تعيد تهيئة هذه الحزمة،\n"
 "قم بتثبيت حزمة menu، وحزمة login،\n"
 "وقم بتشغيل aptitude كمستخدم جذر."
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "إعادة تهيئة %s\n"
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "مُحرر الهيكلة"
 
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "مُحرر الهيكلة"
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "البحث عن: "
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "كل الحزم"
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "بناء العرض"
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "لم تطابق أية حزم الصيغة \"%s\"."
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "أدخل حدّ شجرة الحزم الجديدة: "
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr "أدخل الطريقة الجديدة لتجميع الحزم لهذا العرض: "
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "أدخل الطريقة الجديدة لفرز الحزم لهذا العرض: "
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "معلومات حول"
-
 #: src/pkg_view.cc:344
 #, fuzzy
 msgid "make_package_view: error in arguments -- two main widgets??"
@@ -3005,7 +3175,7 @@
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: مُعطى سيّء!"
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 #, fuzzy
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: لم يعثر على ودجت أساسيّة"
@@ -3203,6 +3373,74 @@
 "broken if it is %s."
 msgstr "الحزم التالية تعتمد على النسخة %B%s%b من %B%s%b، وسوف تُعطب إن كانت %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 "بعض الحزم معطوبة.  أتريد محاولة إصلاحها؟"
+
+#: 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 "يُوفّر"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^تالي"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^إغلاق"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "الحزمة التالية معطوبة:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "الحزمة التالية معطوبة:"
+
+#: 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 "الحزمة التالية معطوبة:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "تنزيل الحزم"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3214,52 +3452,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "همم، ليست هناك أية أخطاء، ولم يجب أن يحدث هذا."
 
-#: src/ui.cc:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "البحث عن:"
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr "أنت الجذر مسبقا!"
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "العملية الفرعية انتهت بخطأ -- هل كتبت كلمة المرور بشكل صحيح؟"
 
-#: src/ui.cc:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr "تحميل المخزن"
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr "حقاً تريد الخروج من Aptitude؟"
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "حقاً تريد تجاهل إعادادات الشخصية وإعادة تحميل الافتراضيّات؟"
 
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr "الحزم"
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 msgid "View available packages and choose actions to perform"
 msgstr "عرض الحزم المتوفرة واختيار الأعمال للقيام بها"
 
-#: src/ui.cc:599
+#: src/ui.cc:666
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3275,15 +3513,15 @@
 "قائمة المساعدة.  هذا برنامج حر، ونرحب بقيامك بإعادة توزيعة\n"
 "وفقاً لشروط معينة؛ راجع 'الرخصة' للتفاصيل."
 
-#: src/ui.cc:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr "اقرأني"
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3291,60 +3529,70 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "استمرار"
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "معاينة تثبيت الحزم"
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "عرض و/أو تعديل الأعمال التي ستتم"
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^سابق"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "بعض الحزم كانت معطوبة وتمّ إصلاحها."
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "تعذر إصلاح بعض الحزم المعطوبة!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "بعض الحزم معطوبة.  أتريد محاولة إصلاحها؟"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, 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 ""
 "تثبيت/إزالة الحزم بتطلب صلاحيات إداريّة، والتي\n"
 "لا تملكها حاليّاً.  هل تود التغيّر إلى حساب الجذر؟\n"
 
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr "تحوُّل إلى جذر"
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr "لا تحوّل إلى جذر"
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 msgid "A package-list update or install run is already taking place."
 msgstr "هناك عملية تحديث أو تثبيت حزم تجري حالياً."
 
-#: src/ui.cc:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "لم يتمّ جدولة تثبيت، أو إزالة أو ترقية أيّة حزم."
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3356,412 +3604,431 @@
 "يمكن ترقية بعض الحزم، إلا أنّك لم تختر ترقيتها.\n"
 "اكتب \"U\" كي تحضّر الترقية."
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, 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 ""
 "تحديث لوائح الحزم بتطلب صلاحيات إداريّة، والتي\n"
 "لا تملكها حاليّاً.  هل تود التغيّر إلى حساب الجذر؟\n"
 
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "التنظيف أثناء القيام بالتنزيل غير مسموح به"
 
-#: src/ui.cc:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr "حذف الملفات المنزلة"
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr "تم حذف ملفات الحزم المنزلة"
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "ملفات الحزم المنزلة الملغاة تم حذفها"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr "^تثبيت/إزالة الحزم"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr "إجراء كل عمليات التثبيت والإزالة المؤخَّرة"
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr "^تحديث لائحة الحزم"
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr "التحقق من وجود نسخ جديدة من الحزم"
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr "^نسيان الحزم الجديدة"
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr "نسيان أيّ الحزم هي \"جديدة\""
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr "^تنظيف مخزن الحزم"
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr "حذف ملفات الحزم التي تم تنزيلها من قبل"
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr "حذف الملفاة ال^ملغية"
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 msgid "Delete package files which can no longer be downloaded"
 msgstr "حذف ملفات الحزم التي لا يمكن تنزيلها بعد الآن"
 
-#: src/ui.cc:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr "تعليم ال^قابلة للترقية"
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "تعليم كل الحزم القابلة للترقية والتي ليست مبقاة للترقية"
 
-#: src/ui.cc:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr "^لعب كانسة الألغام"
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr "^تحوّل إلى مستخدم جذر"
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, 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 ""
 "استخدم 'su' كي تصبح مستخدم جذر؛ سيقوم هذا بإعادة تشغيل البرنامج، ولكن سيتم\n"
 "الإبقاء على إعداداتك"
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr "^إعادة تحميل مخزن الحزم"
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr "إعادة تحميل مخزن الحزم"
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr "^خروج"
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr "الخروج من البرنامج"
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr "تراجع"
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 msgid "Undo the last package operation or group of operations"
 msgstr "التراجع عن آخر عملية حزمة أو مجموعة من العمليات"
 
-#: src/ui.cc:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr "^تثبيت"
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "تعليم الحزمة المحددة حالياً للتثبيت أو الترقية"
 
-#: src/ui.cc:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr "إ^زالة"
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr "تعليم الحزمة المحددة حالياً للإزالة"
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr "^إلغاء"
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "تعليم الحزمة المحددة حالياً وملفات تهيئتها للإزالة"
 
-#: src/ui.cc:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr "^محافظة"
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr "إلغاء أيّ عمل على الحزمة المحددة"
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr "إ^بقاء"
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "إلغاء أي عمل على الحزمة المحددة، وحمايتها من الترقيات المستقبليّة"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr "تحديد ^تلقائي"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, 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 ""
 "تحديد الحزمة المحدّدة على أنها ثُبتت تلقائيّاً؛\n"
 "سوف يتم إزالتها إن لم تعتمد عليها أية حزمة أخرى"
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr "تحديد ^يدوي"
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, 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 ""
 "تحديد الحزمة المحدّدة على أنها ثُبتت يدويّاً؛\n"
 "لن يتم إزالتها إلا إن قمت بذلك"
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr "^منع النسخة"
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, 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 ""
 "منع تثبيت النسخة المرشحة من الحزمة المحددة؛\n"
 "أما النسخ الأجدد من الحزمة فسيتم تثبيتها كالعادة"
 
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr "^معلومات"
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr "عرض مزيد من المعلومات حول الحزمة المحدّدة"
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr "^سجل التغيير"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr "عرض سجل تغيير دبيان للحزمة المحدّدة"
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr "^بحث"
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr "البحث عن حزمة"
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr "البحث ^مجدّداً"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr "تكرار البحث الأخير"
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr "^حدّ العرض"
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr "تصفية لائحة الحزم"
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr "إ^زالة حدّ العرض"
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr "إزالة التصفية من لائحة الحزم"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr "عثور على ^معطوبة"
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "العثور على الحزمة التالية ذات المعتمدات الغير مستوفية"
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr "خيارات ^واجهة المستخدم"
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr "تغيير الإعدادات التي تؤثر على واجهة المستخدم"
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr "إ^دارة المعتمدات"
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "تغيير الإعدادات التي تؤثر على كيفية التعامل مع معتمدات الحزم"
 
-#: src/ui.cc:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr "^متفرقات"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr "تغيير إعدادات البرنامج المختلفة"
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr "^استعادة الخيارات"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr "إعادة كل الإعدادات إلى افتراضيّات النظام"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr "^تالي"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr "عرض الشاشة التالية"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr "^سابق"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr "عرض الشاشة السابقة"
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr "^إغلاق"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr "إغلاق هذه الشاشة"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr "^عرض حزم جديد"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr "إنشاء عرض حزم افتراضي جديد"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr "^مستعرض تصنيفي جديد"
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr "استعراض الحزم بحسب الصنف"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr "^حول"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr "عرض معلومات حول هذا البرنامج"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr "^مساعدة"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr "عرض المساعدة الفورية"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr "دليل ال^مستخدم"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr "عرض دليل البرنامج المفصّل"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr "عرض لائحة بالأسئلة الأكثر طرحاً"
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^سجل التغيير"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
 msgstr "عرض التغييرات المهمة التي تمت في كل نسخة من البرنامج"
 
-#: src/ui.cc:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr "^الرخصة"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 msgid "View the terms under which you may copy the program"
 msgstr "عرض الشروط التي يمكنك نسخ البرنامج ضمنها"
 
-#: src/ui.cc:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr "أعمال"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr "بحث"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "خيارات"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr "عروض"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr "مساعدة"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, 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:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
@@ -3773,6 +4040,16 @@
 msgid "Downloading Changelog"
 msgstr "تنزيل سجل التغيير"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "تنزيل سجل التغيير"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
@@ -3800,3 +4077,32 @@
 #: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
 msgid "No"
 msgstr "لا"
+
+#~ 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 ""
+#~ "كان لبعض الحزم معتمدات غير متوفرة.  قد يعني هذا أنّك\n"
+#~ "طلبت وضعاً مستحيلاً أو إن كنت تستخدم توزيعة\n"
+#~ "unstable فذلك يعني أن بعض الحزم المطلوبة لم تُنشأ\n"
+#~ "بعد أو أنه تمت إزالتها من الوارد.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "رجاء أدخل القرص التالي في السواقة \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Information about "
+#~ msgstr "معلومات حول"
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "تعذر إصلاح بعض الحزم المعطوبة!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^سجل التغيير"

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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +149,100 @@
 msgstr ""
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Uredu"
 
 #: 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:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Poništi"
 
+#: 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 "Predlaže"
+
+#: src/broken_indicator.cc:164
+#, c-format
+msgid "%d installs"
+msgstr ""
+
+#: src/broken_indicator.cc:169
+msgid "1 install"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "%d upgrades"
+msgstr ""
+
+#: src/broken_indicator.cc:196
+msgid "1 upgrade"
+msgstr ""
+
+#: src/broken_indicator.cc:200
+#, c-format
+msgid "%d downgrades"
+msgstr ""
+
+#: src/broken_indicator.cc:205
+msgid "1 downgrade"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "%s: Next"
+msgstr ""
+
+#: 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 ""
@@ -222,48 +306,48 @@
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
 #, 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:283
+#: src/cmdline/cmdline_action.cc:268
 #, 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:307
+#: src/cmdline/cmdline_action.cc:292
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
 #, 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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -304,13 +388,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "S'alliberaran %sB de l'espai de disc"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: 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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr ""
@@ -320,7 +404,7 @@
 msgid "download: you must specify at least one package to download\n"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr ""
 
@@ -382,191 +466,193 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " ili"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 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:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "Slijedeći paketi će biti automatski zadržani:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Slijedeći paketi će biti automatski UKLONJENI:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, 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:328
+#: src/cmdline/cmdline_prompt.cc:332
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, 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:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+msgid "Press Return to continue"
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -574,7 +660,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -582,7 +668,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -590,7 +676,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -598,7 +684,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -606,7 +692,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -614,7 +700,7 @@
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -641,27 +727,79 @@
 "  = : Hold\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:78
+#: src/cmdline/cmdline_resolver.cc:84
 #, c-format
-msgid "search: You must provide at least one search term\n"
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+msgid "give up and quit the program"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+msgid "The following actions will resolve these dependencies:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_show_broken.cc:114
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
+#: src/cmdline/cmdline_search.cc:78
 #, 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 ""
 
-#: 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 ""
@@ -860,12 +998,12 @@
 msgid "Description: "
 msgstr ""
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr ""
 
@@ -907,26 +1045,24 @@
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr ""
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr ""
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr ""
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr ""
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr ""
 
@@ -934,7 +1070,7 @@
 msgid "Couldn't read list of package sources"
 msgstr ""
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr ""
 
@@ -946,29 +1082,33 @@
 msgid "View the progress of the package list update"
 msgstr ""
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr ""
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr ""
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr ""
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -976,77 +1116,77 @@
 "\n"
 msgstr ""
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr ""
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr ""
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr ""
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr ""
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr ""
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "UKLONI"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "INSTALIRAJ"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "REINSTALIRAJ"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "ZADRŽI"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "OŠTEĆEN"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "UKLONI, NIJE KORIÅ TEN"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "UKLONI, ZAVISNOSTI"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "INSTALIRAJ, ZAVISNOSTI"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "ZADRŽI, ZAVISNOSTI"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr ""
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr ""
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1054,32 +1194,37 @@
 "Log complete.\n"
 msgstr ""
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr ""
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr ""
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paket:"
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr ""
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr ""
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1139,11 +1284,6 @@
 msgid "[ERROR]"
 msgstr ""
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr ""
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1181,109 +1321,109 @@
 "press enter\n"
 msgstr ""
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr ""
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr ""
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr ""
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr ""
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr ""
 
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr ""
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr ""
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr ""
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr ""
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr ""
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr ""
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr ""
 
@@ -1304,7 +1444,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr ""
 
-#: 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 ""
@@ -1504,292 +1644,300 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
 msgstr ""
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:94
+#: src/main.cc:93
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:95
+#: src/main.cc:94
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/main.cc:114
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:120
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:121
+#: src/main.cc:120
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:122
+#: src/main.cc:121
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:123
+#: src/main.cc:122
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:123
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:125
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:125
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:127
+#: src/main.cc:126
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/main.cc:129
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:254
+#: src/main.cc:253
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr ""
 
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:318
+#: src/main.cc:317
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:326
+#: src/main.cc:325
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:337
+#: src/main.cc:342
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
 msgstr ""
 
 #: src/mine/cmine.cc:93
@@ -1818,7 +1966,7 @@
 msgid "Lost"
 msgstr ""
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr ""
 
@@ -1992,7 +2140,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr ""
 
@@ -2240,8 +2388,8 @@
 " 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 ""
 
 #: src/pkg_grouppolicy.cc:159
@@ -2534,9 +2682,9 @@
 " 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"
@@ -2585,8 +2733,8 @@
 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 ""
 
 #: src/pkg_grouppolicy.cc:321
@@ -2780,93 +2928,111 @@
 msgid "Versions"
 msgstr ""
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr ""
 
 #: src/pkg_item.cc:80
 #, 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 ""
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr ""
 
-#: src/pkg_item.cc:304
-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
+#, c-format
+msgid "Available versions of %s"
 msgstr ""
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Verzija:"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr ""
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 ""
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 ""
 
-#: src/pkg_item.cc:395
+#: src/pkg_item.cc:414
 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 ""
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr ""
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr ""
 
+#: src/pkg_item.cc:447
+msgid "Hierarchy Editor"
+msgstr ""
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr ""
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr ""
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr ""
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr ""
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr ""
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr ""
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr ""
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
@@ -2880,7 +3046,7 @@
 msgid "make_package_view: bad argument!"
 msgstr ""
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr ""
 
@@ -3068,6 +3234,71 @@
 "broken if it is %s."
 msgstr ""
 
+#: 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 "Automatski prikazuj zašto su paketi oštećeni"
+
+#: 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
+msgid "Previous"
+msgstr ""
+
+#: src/solution_dialog.cc:147
+msgid "Next"
+msgstr ""
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+msgid "Close"
+msgstr ""
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: 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 "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Slijedeći paketi su OŠTEĆENI:"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3079,52 +3310,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr ""
 
-#: src/ui.cc:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr ""
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr ""
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 
-#: src/ui.cc:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr ""
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr ""
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 msgid "View available packages and choose actions to perform"
 msgstr ""
 
-#: src/ui.cc:599
+#: src/ui.cc:666
 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 "
@@ -3132,15 +3363,15 @@
 "conditions; see 'license' for details."
 msgstr ""
 
-#: src/ui.cc:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr ""
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr ""
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3148,460 +3379,479 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+msgid "Preview"
 msgstr ""
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
+#: src/ui.cc:900
+msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:912
+#, c-format
 msgid ""
-"Installing/removing packages requires administrative privileges, which\n"
-"you currently do not have.  Would you like to change to the root account?\n"
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
 msgstr ""
 
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:958
+msgid ""
+"Installing/removing packages requires administrative privileges, which you "
+"currently do not have.  Would you like to change to the root account?"
+msgstr ""
+
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/ui.cc:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
 "upgraded, but you have not chosen to upgrade them.  Type \"U\" to prepare an "
 "upgrade."
 msgstr ""
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
 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 ""
 
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+msgid "Ran out of time while trying to find a solution."
+msgstr ""
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr ""
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
 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 ""
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
 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 ""
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
 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 ""
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
 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 ""
 
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 #, fuzzy
 msgid "^Changelog"
 msgstr "Poništi"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr ""
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 #, fuzzy
 msgid "Remove the filter from the package list"
 msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr ""
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
 msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 msgid "View the terms under which you may copy the program"
 msgstr ""
 
-#: src/ui.cc:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "Opcije"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr ""
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
 msgstr ""
 
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr ""
 
@@ -3613,6 +3863,16 @@
 msgid "Downloading Changelog"
 msgstr "Preuzimam Changelog datoteku"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Preuzimam Changelog datoteku"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +163,103 @@
 "aquest filtre"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "D'acord"
 
 #: 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:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Cancel·la"
 
+#: 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 "Suggereix"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instal·la"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instal·la"
+
+#: 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 "actualitza"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "actualitza"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "desactualitzat"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "desactualitzat"
+
+#: 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 "Següe^nt"
+
+#: 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 ""
@@ -244,22 +331,22 @@
 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:213
+#: src/cmdline/cmdline_action.cc:198
 #, 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:240
+#: src/cmdline/cmdline_action.cc:225
 #, 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:246
+#: src/cmdline/cmdline_action.cc:231
 #, 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:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -268,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:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -277,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:307
+#: src/cmdline/cmdline_action.cc:292
 #, 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:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -293,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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -339,13 +426,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "S'alliberaran %sB de l'espai de disc"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "L'operació %s no és vàlida"
 
-#: 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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "Abandona.\n"
@@ -355,7 +442,7 @@
 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:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "No s'ha pogut llegir la llista de fonts"
 
@@ -419,95 +506,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:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "No s'ha pogut llegir la llista de fonts"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 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:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 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:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 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:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 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:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " o"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Els paquets següents contenen errors."
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 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:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "Els paquets següents s'han apartat automàticament:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 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:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Els paquets següents se suprimiran automàticament:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Els paquets següents es desactualitzaran:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr "Els paquets següents s'han apartat:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "Els paquets següents es tornaran a instal·lar:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "Els paquets nous següents s'instal·laran:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "Els paquets següents se suprimiran:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "Els paquets següents s'actualitzaran:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, 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:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, 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:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -517,100 +604,103 @@
 "sistema.\n"
 "      No contineu si no coneixeu exactament el que esteu fent.\n"
 
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
 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:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Per continuar introduïu la frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, 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:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, 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:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, 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:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquets actualitzats, %lu instal·lats, "
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu tornats a instal·lar, "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualitzats, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, 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:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Es necessita obtenir %sB/%sB d'arxius. "
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Es necessita obtenir %sB d'arxius. "
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Després del desempaquetat s'utilitzaran %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Després del desempaquetat s'alliberaran %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: 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:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "Per continuar premeu la tecla de retorn."
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, 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:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Per continuar premeu la tecla de retorn."
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Esteu segur de voler continuar? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -621,7 +711,7 @@
 "Es mostrarà la informació de les dependències.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -632,7 +722,7 @@
 "No es mostrarà la informació de les dependències.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -643,7 +733,7 @@
 "Es mostraran les versions.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -654,7 +744,7 @@
 "No es mostraran les versions.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -665,7 +755,7 @@
 "Es mostraran els canvis de mides.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +766,7 @@
 "No es mostraran els canvis de mides.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -726,33 +816,86 @@
 "  _ : purga\n"
 "  = : congela\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, 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
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Surt del programa"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Els paquets següents contenen errors."
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, 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"
 
-#: 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 ""
-"Alguns paquets tenen dependències sense satisfer. Això pot significar\n"
-"que heu demanat una situació impossible o si esteu usant la distribució\n"
-"«unstable» que encara no s'han creat o no s'han mogut fora d'Incoming "
-"alguns\n"
-"dels paquets requerits.\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 "No s'han trobat les dependències del paquets següents:\n"
@@ -950,12 +1093,12 @@
 msgid "Description: "
 msgstr "Descripció: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Es baixarà/instal·larà/suprimirà paquets.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordre no ha finalitzat"
 
@@ -999,28 +1142,24 @@
 msgid "UNAVAILABLE"
 msgstr "No disponible"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 ""
-"Introduïu el disc següent a la unitat \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Introduïu el disc etiquetat com a \"%s\" a la unitat \"%s\""
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Prem"
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "S'està baixant"
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Obtingut/s "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "S'està baixant..."
 
@@ -1028,7 +1167,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "No s'ha pogut llegir la llista de fonts de paquets"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "No s'ha pogut bloquejar el directori de la llista...sou superusuari?"
 
@@ -1040,29 +1179,33 @@
 msgid "View the progress of the package list update"
 msgstr "Visualitza la progressió de l'actualització de la llista de paquets"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "No s'han pogut netejar els directoris de la llista"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "S'estan suprimint els fitxers baixats obsolets"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "S'estan suprimint els fitxers baixats obsolets\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "No s'ha pogut obrir el %s per registrar les accions"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "informe del registre"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1073,77 +1216,77 @@
 "que no es realitzen correctament arran de problemes del dpkg no es "
 "completaran.\n"
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "S'instal·laran %li paquets i se'n suprimiran %li.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "s'utilitzarà una espai de disc de %sB\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "S'alliberaran %sB bytes d'espai de disc\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[Actualitza] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[Desactualitza] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "Suprimeix"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "Instal·la"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "Reinstal·la"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "Congelat"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "Amb errors"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "Suprimeix, no utilitzat"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "Suprimeix, dependències"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "Instal·la, dependències"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "Congela, dependències"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1154,36 +1297,41 @@
 "\n"
 "Enregistrament complet.\n"
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "S'estan baixant les paquets"
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Visualitza la progressió de la baixada de paquets"
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paquet: "
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "S'ha produït un error intern, no s'ha pogut generar la llista de paquets a "
 "baixar"
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr "No s'ha pogut solucionar els problemes amb els paquets no disponibles"
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 "S'ha produït un error en la instal·lació dels paquets. S'està intentant la "
 "recuperació:"
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "Premeu retorn per continuar.\n"
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1245,11 +1393,6 @@
 msgid "[ERROR]"
 msgstr "[Error]"
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Introduïu el disc etiquetat com a \"%s\" a la unitat \"%s\""
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1289,118 +1432,118 @@
 "Canvi del mitjà: introduïu el disc amb l'etiqueta '%s' a la unitat '%s' i "
 "cliqueu retorn\n"
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "No s'ha pogut obrir el fitxer d'estat estès de l'Aptitude"
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "S'està llegint la informació d'estat estesa"
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "S'estan inicialitzant els estats dels paquets"
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "No s'ha pogut obrir el fitxer d'estat de l'Aptitude"
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "S'està escrivint la informació d'estat estesa"
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 "S'ha produït un sobreeiximent de memòria intermèdia interna al paquet \"%s\" "
 "quan s'estava escrivint el fitxer d'estat"
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "No s'ha pogut escriure el fitxer d'estat"
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "S'ha produït un error en escriure el fitxer d'estat"
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "no s'ha pogut reemplaçar el fitxer d'estat antic"
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 "No s'han pogut resoldre les dependències, alguns paquets no es poden "
 "instal·lar"
 
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de fonts."
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 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:1335
+#: src/generic/aptcache.cc:1556
 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:141
+#: 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:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "No s'ha pogut reemplaçar el %s pel nou fitxer de configuració"
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 "Avís: no s'ha pogut bloquejar el fitxer de memòria cau. S'està obrint amb el "
 "mode de només lectura"
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "'(' no està tancada"
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "El tipus de dependència és desconegut: %s"
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "El tipus d'acció és desconegut: %s"
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "La prioritat %s és desconeguda"
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "El tipus de patró és desconegut: %c"
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "L'expressió, inesperadament, és buida"
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "L'expressió està mal formada"
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "El ')' és inesperat"
 
@@ -1426,7 +1569,7 @@
 msgstr ""
 "No s'ha pogut obtenir el valor de $HOME, s'està utilitzant TMPDIR (insegur)"
 
-#: 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 "El registre de canvis de %s"
@@ -1647,17 +1790,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "El tipus de política d'ordenació '%s' és invàlid"
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilat el %s %s\n"
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
@@ -1666,7 +1809,7 @@
 "\n"
 "Versió de les NCurses: %s\n"
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1675,22 +1818,22 @@
 "\n"
 "Versió de les Curses: %s\n"
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "versió de la libsigc++: %s\n"
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Utilització: aptitude [-S nomfitxer] [-u|-i]"
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "      aptitude [opcions] <acció> ..."
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1700,44 +1843,44 @@
 "interactiu):\n"
 "\n"
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install       - Instal·la/actualitza els paquets\n"
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove        - Suprimeix els paquets\n"
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, 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:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold          - Deixa els paquets congelats\n"
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, 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:94
+#: src/main.cc:93
 #, 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:95
+#: src/main.cc:94
 #, 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:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1746,17 +1889,17 @@
 " forbid-version - Prohibeix l'actualització a una versió específica d'un "
 "paquet.\n"
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update        - Baixa les llistes dels paquets nous/actualitzables\n"
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrades      - Realitza una actualització segura\n"
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1765,75 +1908,75 @@
 " dist-upgrade  - Realitza una actualització, probablement instal·lant i "
 "suprimint paquets\n"
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-net     - Oblida quins paquets són \"nous\"\n"
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, 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:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " mostra        - Mostra informació detallada d'un paquet\n"
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean         - Suprimeix els fitxers dels paquets baixats\n"
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean     - Suprimeix els fitxers dels paquets baixats antics\n"
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Visualitza un registre de modificacions d'un paquet\n"
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, 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:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opcions:\n"
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Aquest text d'ajuda\n"
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, 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:115
+#: src/main.cc:114
 #, 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:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Pregunta permanentment les confirmacions o accions\n"
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, 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:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1842,7 +1985,7 @@
 " -F format      Especifica un format per a la visualització dels resultats "
 "de la cerca; fes una ullada al manual\n"
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1850,7 +1993,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:120
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -1858,17 +2001,17 @@
 " -w amplada      Especifica l'amplada de la visualització pel formatat dels "
 "resultats de la cerca\n"
 
-#: src/main.cc:121
+#: src/main.cc:120
 #, 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:122
+#: src/main.cc:121
 #, 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:123
+#: src/main.cc:122
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -1876,18 +2019,18 @@
 " -D           Mostra les dependències dels paquets modificats "
 "automàticament.\n"
 
-#: src/main.cc:124
+#: src/main.cc:123
 #, 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:125
+#: src/main.cc:124
 #, 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:126
+#: src/main.cc:125
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -1895,12 +2038,12 @@
 " -t [versió]   Especifica la versió de llançament de la qual s'haurien "
 "d'instal·lar les paquets\n"
 
-#: src/main.cc:127
+#: src/main.cc:126
 #, 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:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1910,60 +2053,68 @@
 "recomanacions com\n"
 "                dependències fortes\n"
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, 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:130
+#: src/main.cc:129
 #, 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:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr "-i          : Executa la instal·lació a l'inici.\n"
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  L'aptitude no té super poders bovins.\n"
 
-#: src/main.cc:254
+#: src/main.cc:253
 #, 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:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "Rar: s'ha rebut un codi d'opció desconegut\n"
 
-#: src/main.cc:318
+#: src/main.cc:317
 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:326
+#: src/main.cc:325
 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:337
+#: src/main.cc:342
 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:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ordre desconeguda \"%s\"\n"
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Opció invàlida pel mode interactiu: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
 #: src/mine/cmine.cc:93
 #, c-format
@@ -1991,7 +2142,7 @@
 msgid "Lost"
 msgstr "Perdut"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr "Busca mines"
 
@@ -2167,7 +2318,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr "Paquet"
 
@@ -2431,13 +2582,14 @@
 "inicial."
 
 #: 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 ""
 "Programes per a faxmòdems i d'altres dispositius de comunicació\n"
 " Els paquets de la secció 'comm' s'utilitzen per al control dels mòdems i "
@@ -2893,14 +3045,15 @@
 "trobàveu en aquesta secció s'han migrat a '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"
@@ -2964,11 +3117,12 @@
 " Aquests paquets disposen d'una versió actualitzada."
 
 #: 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 ""
 "Paquets nous\n"
 " Aquesta paquets s'han afegit a Debian des de l'última vegada que vau "
@@ -3220,105 +3374,125 @@
 msgid "Versions"
 msgstr "Versions"
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Sí, soc conscient que no és una bona idea"
 
 #: src/pkg_item.cc:80
-#, c-format
+#, 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 és un paquet essencial.\n"
 "\n"
 "Esteu segur que el voleu suprimir?\n"
 "Si n'esteu segur introduïu '%s'."
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "Informació quant a %s"
 
-#: src/pkg_item.cc:304
-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 "Versions disponibles de "
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versions"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependències de %s"
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 "Paquets que depenen de %s"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 "S'està informant d'un error a %s:\n"
 
-#: src/pkg_item.cc:395
+#: 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 ""
 "No sou superusuari i no s'ha pogut trobat cap mètode\n"
 "per esdevenir-ho. Per reconfigurar aquest paquet\n"
 "heu d'instal·lar el paquet menú, el paquet login o\n"
 "executeu l'aptitude com a superusuari."
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "S'està reconfigurant %s\n"
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Editor de jerarquies"
 
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor de jerarquies"
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Cerca: "
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Tots els paquets"
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "S'està construïnt la vista"
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "No hi ha cap paquet que coincideixi amb el patró \"%s\"."
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "Introduïu el nou límit de l'arbre de paquets: "
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr ""
 "Introduïu el nou mecanisme d'agrupació de paquets per a aquesta "
 "visualització: "
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 "Introduïu el nou mecanisme d'ordenació de paquets per a aquesta "
 "visualització: "
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informació sobre "
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
@@ -3336,7 +3510,7 @@
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: argument erroni."
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr ""
 "make_package_view: no s'ha trobat cap element principal de la interfície "
@@ -3558,6 +3732,74 @@
 "Els següents paquets depenen de la versió %B%s%b del %B%s%b i contindran "
 "errors si és %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 "Alguns paquets contenen errors. Voleu intentar arreglar-los?"
+
+#: 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 "Proporciona"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "Següe^nt"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "Tan^ca"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Els paquets següents contenen errors."
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Els paquets següents contenen errors."
+
+#: 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 "Els paquets següents contenen errors."
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "S'estan baixant les paquets"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3569,56 +3811,56 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 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:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Cerca:"
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr "Ja sou el superusuari"
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 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:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr "S'està carregant la memòria cau"
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr "Esteu segur de voler sortir de l'Aptitude?"
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 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:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr "Paquets"
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 msgid "View available packages and choose actions to perform"
 msgstr "Observeu els paquets disponibles i escolliu les accions a realitzar"
 
-#: src/ui.cc:599
+#: src/ui.cc:666
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3636,15 +3878,15 @@
 "podeu redistribuir acceptant una seguit de termes dels quals podeu trobar "
 "més informació a 'llicència'."
 
-#: src/ui.cc:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3652,61 +3894,71 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continua"
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Previsualització de la instal·lació de paquets"
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Visualitza i/o ajusta les accions que es duran a terme"
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Ante"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns paquets contenien errors i s'han arreglat"
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Alguns dels paquets amb errors no s'han pogut arreglar"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "Alguns paquets contenen errors. Voleu intentar arreglar-los?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, 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 ""
 "El procés de suprimir/instal·lar paquets precisa de privilegis "
 "d'administrador,\n"
 "els quals actualment no teniu. Voleu canviar al compte de superusuari?\n"
 
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr "Esdevé superusuari"
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr "No esdevinguis superusuari"
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 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:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "No s'instal·larà, actualitzarà o suprimirà cap paquet."
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3718,170 +3970,185 @@
 "Alguns paquets es podrien actualitzar, però no heu escollit fer-ho.\n"
 "Premeu \"U\" per preparar-ne una actualització."
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, 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 ""
 "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:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr "Perdeu el temps intentant trobar les mines"
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 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:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr "S'estan suprimint els fitxers baixats"
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr "S'han suprimit els fitxers dels paquets baixats"
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, 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:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Perdeu el temps intentant trobar les mines"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr "^Instal·la/suprimeix els paquets"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr "Realitza totes les instal·lacions i supressions pendents"
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr "Act^ualitza la llista de paquets"
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr "Verifica si hi ha noves versions dels paquets"
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr "^Oblida els paquets nous"
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr "Oblida quins paquets són \"nous\""
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr "Neteja la memòria ^cau dels paquets"
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr "Suprimeix els fitxers dels paquets prèviament baixats"
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr "Neteja els fitxers ^obsolets"
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 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:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr "Marca com a ^actualitzable"
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 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:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr "^Juga al busca mines"
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr "^Sigues superusuari"
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, 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 ""
 "Executeu l'ordre 'su' per ser superusuari. Aquesta ordre reinicia el "
 "programa però manté els paràmetres personals."
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr "^Recarrega la memòria cau dels paquets"
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr "Torna a carregar la memòria cau dels paquets"
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr "Su^rt"
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 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:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr "^Instal·la"
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 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:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr "Sup^rimeix"
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr "Senyala els paquets seleccionats per a la corresponent supressió"
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr "^Purga"
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 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:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr "Man^té"
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr "Cancel·la qualsevol acció al paquet seleccionat"
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr "Con^gela"
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -3889,242 +4156,246 @@
 "Cancel·la qualsevol acció al paquet seleccionat i protegeix-lo de futures "
 "actualitzacions"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr "Marca ^Automàtic"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, 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 ""
 "Marca els paquets seleccionat com a instal·lats automàticament;\n"
 "se suprimiran automàticament si cap paquet en depèn"
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr "Marca ^Manual"
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, 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 ""
 "Marca els paquets seleccionats com a instal·lats manualment;\n"
 "no se suprimiran si no ho feu vosaltres manualment"
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr "^Prohibeix la versió"
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, 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 ""
 "Prohibeix la instal·lació de la versió candidata del paquet seleccionat;\n"
 "les noves versions del paquet s'instal·laran"
 
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr "I^nformació"
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr "Mostra més informació dels paquets seleccionats"
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr "Registre de modifi^cacions"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Mostra el registre de modificacions de Debian dels paquets seleccionats"
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr "^Cerca"
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr "Cerca un paquet"
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr "Torna a cerc^ar"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr "Repeteix l'última cerca"
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr "^Limita la visualització"
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr "Aplica un filtre a la llista de paquets"
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr "No limits la vis^ualització"
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr "Suprimeix el filtre de la llista de paquets"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr "C^erca els trencats"
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Cerca el següent paquet amb dependències no resoltes"
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr "Opcions de l'I^U"
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr "Canvia els paràmetres relacionats amb la interfície d'usuari"
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr "Gestió de les ^dependències"
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 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:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr "^Diversos"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr "Canvia diversos paràmetres de programa"
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr "^Recupera les opcions"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr "Reinicia tots els paràmetres als predeterminats del sistema"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr "Següe^nt"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr "Mostra la visualització següent"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr "^Ante"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr "Mostra la visualització anterior"
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr "Tan^ca"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr "Tanca aquesta visualització"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr "Nova ^vista de paquets"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr "Crea una nova vista de paquets predeterminada"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr "Nou na^vegador per categories"
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr "Navega pels paquets per categories"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr "Qu^ant a"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr "Mostra la informació sobre aquest programa"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr "A^juda"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr "Mostra la informació en línia"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr "^Manual d'usuari"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr "Mostra el manual detallat del programa"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr "PM^F"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr "Mostra una llista de les preguntes més freqüents"
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "Registre de ^canvis"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, 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:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr "^Llicència"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 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:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr "Accions"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "Opcions"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr "Vistes"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4132,11 +4403,11 @@
 "%s: Menú  %s: Ajuda  %s: Surt  %s: Actualitza  %s: Baixa/Instal·la/Suprimeix "
 "Paquets"
 
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no_key"
 
@@ -4150,6 +4421,16 @@
 msgid "Downloading Changelog"
 msgstr "S'està baixant el registre de modificacions"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "S'està baixant el registre de modificacions"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
@@ -4178,6 +4459,38 @@
 msgid "No"
 msgstr "No"
 
+#~ 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 ""
+#~ "Alguns paquets tenen dependències sense satisfer. Això pot significar\n"
+#~ "que heu demanat una situació impossible o si esteu usant la distribució\n"
+#~ "«unstable» que encara no s'han creat o no s'han mogut fora d'Incoming "
+#~ "alguns\n"
+#~ "dels paquets requerits.\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Introduïu el disc següent a la unitat \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Opció invàlida pel mode interactiu: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informació sobre "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Alguns dels paquets amb errors no s'han pogut arreglar"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "Registre de ^canvis"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Deixeu-me tranquil, estic intentant pensar.\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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +149,103 @@
 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:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 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:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Zrušit"
 
+#: 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 "Navrhuje"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalovat"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalovat"
+
+#: 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 "aktualizovat"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "aktualizovat"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "degradován"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "degradován"
+
+#: 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 "Další"
+
+#: 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 ""
@@ -230,22 +317,22 @@
 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:213
+#: src/cmdline/cmdline_action.cc:198
 #, 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:240
+#: src/cmdline/cmdline_action.cc:225
 #, 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:246
+#: src/cmdline/cmdline_action.cc:231
 #, 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:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -254,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:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -263,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:307
+#: src/cmdline/cmdline_action.cc:292
 #, 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:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -277,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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -320,13 +407,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "Na disku se uvolní %sB"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Neplatná operace %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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "Přerušeno.\n"
@@ -336,7 +423,7 @@
 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:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Nemohu číst seznam zdrojů"
 
@@ -401,95 +488,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:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "Nemohu číst seznam zdrojů"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 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:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "ale %s není instalovaný."
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 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:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 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:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " nebo"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Následující balíky jsou POŠKOZENY:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 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:250
+#: src/cmdline/cmdline_prompt.cc:251
 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:251
+#: src/cmdline/cmdline_prompt.cc:252
 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:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Následující balíky budou automaticky ODSTRANĚNY:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Následující balíky budou DEGRADOVÁNY:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 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:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "Následující balíky budou reinstalovány:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "Následující NOVÉ balíky budou instalovány:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "Následující balíky budou ODSTRANĚNY:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "Následující balíky budou aktualizovány:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, 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:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, 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:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -498,96 +585,99 @@
 "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:328
+#: src/cmdline/cmdline_prompt.cc:332
 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:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, 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:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, 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:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, 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:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, 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:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu balíků aktualizováno, %lu nově instalováno, "
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalováno, "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradováno, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, 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:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Potřebuji stáhnout %sB/%sB archivů. "
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Potřebuji stáhnout %sB archivů. "
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Po rozbalení bude použito %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Po rozbalení bude uvolněno %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Chybná akce '%c'\n"
 
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "Pro pokračování stiskněte Enter."
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, 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:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Pro pokračování stiskněte Enter."
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Chcete pokračovat? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -598,7 +688,7 @@
 "Informace o závislostech budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -609,7 +699,7 @@
 "Informace o závislostech nebudou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -620,7 +710,7 @@
 "Verze budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -631,7 +721,7 @@
 "Verze nebudou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -642,7 +732,7 @@
 "Změny velikostí budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -653,7 +743,7 @@
 "Změny velikostí nebudou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -702,31 +792,83 @@
 "  _ : Odstranění i s konfigurací\n"
 "  = : Podržení v aktuálním stavu\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, 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
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Ukončí program"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Následující balíky jsou POŠKOZENY:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "hledání: Musíte zadat alespoň jeden hledaný term\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 ""
-"Některé balíky mají nesplněné závislosti. To může znamenat, že požadujete\n"
-"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
-"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty.\n"
-"\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 "Následující balíky mají nesplněné závislosti:\n"
@@ -924,12 +1066,12 @@
 msgid "Description: "
 msgstr "Popis: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Teoreticky by stáhl/nainstaloval/odstranil balíky.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Vnitřní chyba, výběr neskončil"
 
@@ -971,28 +1113,24 @@
 msgid "UNAVAILABLE"
 msgstr "NEDOSTUPNÝ"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 ""
-"Následující disk vložte do mechaniky \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Vložte do mechaniky \"%s\" disk nazvaný \"%s\""
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Cíl "
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Stahuji "
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Mám "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "Stahuji..."
 
@@ -1000,7 +1138,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "Nemohu číst seznam se zdroji balíků"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "Nemohu zamknout adresář seznamů...jste root?"
 
@@ -1012,29 +1150,33 @@
 msgid "View the progress of the package list update"
 msgstr "Zobrazí průběh aktualizace seznamu balíků"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "Nemohu vyčistit adresáře seznamů"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "Mažu staré stažené soubory"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Mažu staré stažené soubory\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "Nemohu otevřít %s pro záznam akcí"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "záznam hlášení"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1045,77 +1187,77 @@
 "kvůli problémům v dpkg nemusí být dokončeny.\n"
 "\n"
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "Budu instalovat %li balíků a odstraňovat %li balíků.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "%sB místa na disku bude použito\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "%sB místa na disku bude uvolněno\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[AKTUALIZACE] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[DEGRADACE] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "ODSTRANIT"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "INSTALOVAT"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "REINSTALOVAT"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "PODRŽET"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "POŠKOZENÝ"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "ODSTRANIT, NEPOUŽÍVANÝ"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "ODSTRANIT, ZÁVISLOSTI"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "INSTALOVAT, ZÁVISLOSTI"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "PODRŽET, ZÁVISLOSTI"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1126,32 +1268,37 @@
 "\n"
 "Záznam kompletní.\n"
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "Stahuji balíky"
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Zobrazí průběh stahování balíků"
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Balík: "
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Vnitřní chyba: nemohu vytvořit seznam balíků ke stažení"
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr "Nemohu opravit kvůli nedostupným balíkům"
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr "Během instalace balíků se stalo něco zlého. Zkouším obnovit:"
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "Pro pokračování stiskněte enter.\n"
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "Nemohu získat systémový zámek! (Možná běží další apt nebo dpkg?)"
@@ -1211,11 +1358,6 @@
 msgid "[ERROR]"
 msgstr "[CHYBA]"
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Vložte do mechaniky \"%s\" disk nazvaný \"%s\""
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1254,110 +1396,110 @@
 msgstr ""
 "Výměna média: Do mechaniky '%s' vložte disk nazvaný '%s' a stiskněte enter\n"
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "Nemohu otevřít rozšířený stavový soubor programu Aptitude"
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Čtu rozšířené stavové informace"
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Inicializuji stavy balíků"
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "Nemohu otevřít stavový soubor programu Aptitude"
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "Zapisuji rozšířené stavové informace"
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr "Při zápisu stavového souboru přetekl interní buffer na balíku \"%s\""
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "Nemohu zapsat stavový soubor"
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "Chyba při zápisu stavového souboru"
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "nemohu nahradit starý stavový soubor"
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 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:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr "Nelze přečíst seznam zdrojů."
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 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:1335
+#: src/generic/aptcache.cc:1556
 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:141
+#: 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:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "Nemohu nahradit %s novým konfiguračním souborem"
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 "Varování: nelze zamknout cache soubor. Otevírám v režimu pouze pro čtení"
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "Nepárová '('"
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Neznámá závislost: %s"
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Neznámá akce: %s"
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Neznámá priorita: %s"
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Neznámý vzor: %c"
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "Neočekávaný prázdný výraz"
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "Špatně zformulovaný výraz"
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "Neočekávaná ')'"
 
@@ -1381,7 +1523,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "Nemohu zjistit hodnotu $HOME, používám TMPDIR (nebezpečné)"
 
-#: 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 "Soubor změn %s"
@@ -1583,17 +1725,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Neplatný třídící mechanizmus '%s'"
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s zkompilován %s %s\n"
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilátor: g++ %s\n"
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
@@ -1602,7 +1744,7 @@
 "\n"
 "Verze ncurses: %s\n"
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1611,22 +1753,22 @@
 "\n"
 "Verze curses: %s\n"
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "verze libsigc++: %s\n"
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Použití: aptitude [-S názsoub] [-u|-i]"
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [volby] <akce> ..."
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1635,42 +1777,42 @@
 "  Akce (pokud nejsou zadány, aptitude spustí interaktivní režim):\n"
 "\n"
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Instaluje/aktualizuje balíky\n"
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Odstraní balíky\n"
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, 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:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Ochrání balíky před aktualizací\n"
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, 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:94
+#: src/main.cc:93
 #, 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:95
+#: src/main.cc:94
 #, 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:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1678,17 +1820,17 @@
 msgstr ""
 " forbid-version - Zakáže aptitude aktualizaci na konkrétní verzi balíku.\n"
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, 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:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Provede bezpečnou aktualizaci\n"
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1697,75 +1839,75 @@
 " dist-upgrade - Provede aktualizaci, při které možná (na|od)instaluje "
 "balíky\n"
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Zapomene, které balíky jsou \"nové\"\n"
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, 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:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Zobrazí podrobné informace o balíku\n"
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Smaže stažené .deb soubory balíků\n"
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, 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:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Zobrazí seznam změn balíku\n"
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Stáhne .deb soubor balíku\n"
 
-#: src/main.cc:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr "  Volby:\n"
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Tato nápověda\n"
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, 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:115
+#: src/main.cc:114
 #, 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:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Vždy vyžaduje potvrzení akcí\n"
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, 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:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1773,60 +1915,60 @@
 msgstr ""
 " -F formát      Zadejte formát pro zobrazení výsledků hledání; viz manuál\n"
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, 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:120
+#: src/main.cc:119
 #, 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:121
+#: src/main.cc:120
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Agresivně zkusí opravit poškozené balíky.\n"
 
-#: src/main.cc:122
+#: src/main.cc:121
 #, 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:123
+#: src/main.cc:122
 #, 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:124
+#: src/main.cc:123
 #, 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:125
+#: src/main.cc:124
 #, 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:126
+#: src/main.cc:125
 #, 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:127
+#: src/main.cc:126
 #, 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:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1835,57 +1977,65 @@
 " --with(out)-recommends\tNastaví, zda se mají doporučené závislosti\n"
 "                brát jako silné závislosti\n"
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, 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:130
+#: src/main.cc:129
 #, 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:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Při startu spustit instalaci.\n"
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Tato aptitude nemá schopnosti svaté krávy.\n"
 
-#: src/main.cc:254
+#: src/main.cc:253
 #, 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:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "PODIVNÉ: obdržen kód neznámé volby\n"
 
-#: src/main.cc:318
+#: src/main.cc:317
 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:326
+#: src/main.cc:325
 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:337
+#: src/main.cc:342
 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:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Neznámý příkaz \"%s\"\n"
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Neplatná volba pro interaktivní režim: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
 #: src/mine/cmine.cc:93
 #, c-format
@@ -1913,7 +2063,7 @@
 msgid "Lost"
 msgstr "Prohrál"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr "Hledání min"
 
@@ -2089,7 +2239,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr "Balík"
 
@@ -2348,13 +2498,14 @@
 " Balíky ze sekce 'base' jsou součástí minimální instalace systému."
 
 #: 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 ""
 "Programy pro faxmodemy a jiná komunikační zařízení\n"
 " Balíky ze sekce 'comm' se používají k ovládání modemů a dalších "
@@ -2790,14 +2941,15 @@
 "balíky přesouvány do hlavního archivu v sekci '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"
@@ -2861,11 +3013,12 @@
 " K těmto balíkům existuje novější verze."
 
 #: 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 ""
 "Nové Balíky\n"
 " Tyto balíky byly přidány do Debianu od posledního čištění \"nových\" "
@@ -3113,101 +3266,121 @@
 msgid "Versions"
 msgstr "Verze"
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Ano, vím, že je to špatný nápad"
 
 #: src/pkg_item.cc:80
-#, c-format
+#, 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 je nezbytný balík!\n"
 "\n"
 "Jste si jisti, že jej chcete odstranit?\n"
 "Pokud jste, napište '%s'."
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "Informace o %s"
 
-#: src/pkg_item.cc:304
-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 "Dostupné verze "
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Verze"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Závislosti %s"
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 "Balíky závisející na %s"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 "Hlásím chybu v %s:\n"
 
-#: src/pkg_item.cc:395
+#: 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 ""
 "Nejste root a nevidím možnost, jak se jím\n"
 "stát.  Pro rekonfiguraci tohoto balíku\n"
 "nainstalujte balíky menu a login, nebo\n"
 "spusťte  aptitude jako root."
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Překonfigurovávám %s\n"
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Editor hierarchie"
 
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor hierarchie"
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Hledat: "
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Všechny balíky"
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Sestavuji pohled"
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "Žádné balíky nevyhovují vzoru \"%s\"."
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "Omezit zobrazení na: "
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr "Seskupovací mechanizmus: "
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Třídící mechanizmus: "
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informace o "
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: chyba v argumentech -- dva hlavní widgety??"
@@ -3221,7 +3394,7 @@
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: chybný argument!"
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: nebyl nalezen hlavní widget"
 
@@ -3433,6 +3606,74 @@
 "Následující balíky jsou závisí na verzi %B%s%b balíku %B%s%b. Pokud bude "
 "balík %s, budou tyto balíky porušeny."
 
+#: 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 "Některé balíky jsou poškozené. Zkusit je opravit?"
+
+#: 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 "Poskytuje"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "Další"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "Zavřít"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Následující balíky jsou POŠKOZENY:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Následující balíky jsou POŠKOZENY:"
+
+#: 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 "Následující balíky jsou POŠKOZENY:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Stahuji balíky"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3444,52 +3685,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 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:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Hledat:"
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr "Již jste root!"
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 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:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr "Nahrávám cache"
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr "Opravdu ukončit Aptitude?"
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Opravdu zahodit osobní nastavení a načíst standardní hodnoty?"
 
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr "Balíky"
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 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:599
+#: src/ui.cc:666
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3505,15 +3746,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:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr "help-cs.txt"
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr "README.cs"
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3521,60 +3762,70 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Pokračovat"
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Náhled instalace balíků"
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Zobrazí a/nebo upraví akce, které se mají vykonat"
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Předchozí"
+
+#: src/ui.cc:900
+#, 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:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Některé poškozené balíky nemohly být opraveny!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "Některé balíky jsou poškozené. Zkusit je opravit?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, 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 ""
 "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:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr "Stát se rootem"
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr "Nestát se rootem"
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 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:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Žádné balíky nejsou označeny k instalaci, aktualizaci nebo odstranění."
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3587,164 +3838,179 @@
 "aktualizovat.\n"
 "Aktualizaci můžete připravit klávesou \"U\"."
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, 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 ""
 "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:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr "Ukrátit čas hledáním min."
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Čištění během stahování není dovoleno"
 
-#: src/ui.cc:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr "Mažu stažené soubory"
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr "Stažené balíky byly smazány"
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, 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:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Ukrátit čas hledáním min."
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr "^Instalovat/odstranit balíky"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr "Provede všechny nevyřízené instalace a odstraňování"
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr "^Aktualizovat seznam balíků"
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr "Zjistí, zda nejsou k dispozici novější verze balíků"
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr "^Zapomenout nové balíky"
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr "Zapomene, které balíky jsou \"nové\""
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr "Vyčistit ^cache s balíky"
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr "Smaže stažené soubory (balíky) z /var/cache/apt"
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr "Vyčistit staré s^oubory"
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Smaže soubory, které se již nedají stáhnout"
 
-#: src/ui.cc:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr "Označit aktualizovatelné"
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 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:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr "Zahrát si minové ^pole"
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr "Stát se rootem"
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, 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 ""
 "Pro přepnutí na uživatele root spusťte 'su'. Tím se program restartuje,\n"
 "ale nastavení budou zachována"
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr "Znovu načíst cache"
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr "Znovu načíst obsah cache"
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr "Konec"
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 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:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr "^Instalovat"
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Označí aktuálně vybraný balík pro instalaci nebo aktualizaci"
 
-#: src/ui.cc:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr "Odst^ranit"
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr "Označí aktuálně vybraný balík pro odstranění"
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr "Vyčistit"
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 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:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr "Ponechat"
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr "Na vybraném balíku zruší veškeré akce"
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr "Přidržet"
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -3752,250 +4018,254 @@
 "Na vybraném balíku zruší veškeré akce a ochrání jej před budoucími "
 "aktualizacemi."
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr "Spravovat ^automaticky"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, 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 ""
 "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:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr "Spravovat ručně"
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, 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 ""
 "Označí vybraný balík, jako by byl nainstalován ručně;\n"
 "takový nebude odstraněn, dokud jej neodstraníte sami"
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr "Zakázat ^verzi"
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, 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 ""
 "Zakáže, aby se nainstalovala kandidátská verze balíku;\n"
 "novější verze balíku se budou instalovat jako obvykle"
 
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr "I^nformace"
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr "Pro vybraný balík zobrazí další informace"
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 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:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr "Hledat"
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr "Hledá balík"
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr "Hledat znovu"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr "Zopakuje poslední hledání"
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr "Omezit zobrazení"
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr "Na seznam balíků aplikuje výběrový filtr"
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr "Zrušit omezení"
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr "Odstraní filtr aplikovaný na seznam balíků"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr "Hledat porušené"
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hledá další balík s nesplněnými závislostmi"
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr "Nastavení zobrazení"
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr "Změní nastavení, která ovlivňují uživatelské rozhraní"
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 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:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr "Různé"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr "Změní ostatní nastavení programu"
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr "Původní nastavení"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr "Vrátí všechna nastavení do původního stavu"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr "Další"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr "Zobrazí další pohled"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr "^Předchozí"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr "Zobrazí předchozí pohled"
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr "Zavřít"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr "Zavře tento pohled"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr "No^vý pohled na balíky"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr "Vytvoří nový standardní pohled na balíky"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr "Nový prohlížeč kategorií"
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr "Prohlíží balíky podle kategorií"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr "O progr^amu"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr "Zobrazí informace o programu"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr "Nápověda"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr "Zobrazí on-line nápovědu"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr "Uživatelský ^manuál"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr "Zobrazí podrobný manuál tohoto programu"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr "Zobrazí seznam často kladených otázek"
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, 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:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 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:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr "Akce"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr "Hledat"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "Volby"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr "Pohledy"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, 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:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ano_key"
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ne_key"
 
@@ -4007,6 +4277,16 @@
 msgid "Downloading Changelog"
 msgstr "Stahuji Changelog"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Stahuji 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"
@@ -4035,6 +4315,39 @@
 msgid "No"
 msgstr "Ne"
 
+#~ 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 ""
+#~ "Některé balíky mají nesplněné závislosti. To může znamenat, že "
+#~ "požadujete\n"
+#~ "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
+#~ "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí "
+#~ "fronty.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Následující disk vložte do mechaniky \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Neplatná volba pro interaktivní režim: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informace o "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Některé poškozené balíky nemohly být opraveny!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Běž pryč, zkouším přemýšlet.\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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +156,103 @@
 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:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "O.k."
 
 #: 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:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Afbryd"
 
+#: 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 "Foreslår"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "installerede"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "installerede"
+
+#: 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 "opgradér"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "opgradér"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "nedgraderet"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "nedgraderet"
+
+#: 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 "^Næste"
+
+#: 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 ""
@@ -238,22 +325,22 @@
 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:213
+#: src/cmdline/cmdline_action.cc:198
 #, 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:240
+#: src/cmdline/cmdline_action.cc:225
 #, 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:246
+#: src/cmdline/cmdline_action.cc:231
 #, 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:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -262,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:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -271,13 +358,13 @@
 "Kunne ikke finde pakken \"%s\". Men følgende\n"
 "pakker har \"%s\" i deres navn:\n"
 
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
 #, 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:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -286,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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -330,13 +417,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "Vil frigøre %sB diskplads"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ugyldig operation %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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "Afbryd.\n"
@@ -346,7 +433,7 @@
 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:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Kunne ikke læse liste over pakkekilder"
 
@@ -412,97 +499,97 @@
 msgstr ""
 "Hvad det er? Det er en elefant der bliver ædt af en slange, selvfølgelig.\n"
 
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "Kunne ikke læse liste over pakkekilder"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 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:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "men %s er installeret."
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 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:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 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:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " eller"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Følgende pakker er BRUDTE:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 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:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "Følgende pakker er automatisk blevet tilbageholdt:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Følgende NYE pakker vil automatisk blive installeret:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Følgende pakker vil automatisk blive AFINSTALLERET:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil blive NEDGRADERET:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er blevet tilbageholdt:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "Følgende pakker vil blive GENINSTALLERET:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil blive installeret:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil blive AFINSTALLERET:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil blive opgraderet:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, 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:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, 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:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -511,96 +598,99 @@
 "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:328
+#: src/cmdline/cmdline_prompt.cc:332
 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:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, 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:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, 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:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, 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:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, 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:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakker opgraderet, %lu nyinstalleret,  "
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geninstalleret, "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderet, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, 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:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Skal hente %sB/%sB arkiver. "
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Skal hente %sB arkiver. "
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Efter udpakning vil %sB blive brugt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Efter udpakning vil %sB blive frigjort.\n"
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: 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:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "Tryk retur for at fortsætte."
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, 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:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Tryk retur for at fortsætte."
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vil du fortsætte) [Y/n?] "
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -611,7 +701,7 @@
 "Oplysning om afhængigheder vil blive vist\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -622,7 +712,7 @@
 "Oplysning om afhængigheder vil ikke blive vist\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -633,7 +723,7 @@
 "Versioner vil blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -644,7 +734,7 @@
 "Versioner vil ikke blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -655,7 +745,7 @@
 "Størrelsesændringer vil blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -666,7 +756,7 @@
 "Størrelsesændringer vil ikke blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -715,33 +805,83 @@
 "  _ : Udrens\n"
 "  = : Tilbagehold\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, 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
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Afslut programmet"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Følgende pakker er BRUDTE:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "søg: du skal indtaste mindst én søgeterm\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 ""
-"Visse pakker har uopfyldte afhængigheder. Dette kan betyde at du har ønsket\n"
-"noget som ikke kan opfyldes, eller hvis du bruger distributionen \"unstable"
-"\"\n"
-"at visse påkrævede pakker enten endnu ikke er lavet eller at de er blevet\n"
-"flyttet ud af \"Incoming\".\n"
-"\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 "Følgende pakker har uopfyldte afhængigheder:\n"
@@ -939,12 +1079,12 @@
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Ville hente/installere/afinstallere pakker.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Intern fejl, kunne ikke gennemføre ordre"
 
@@ -986,28 +1126,24 @@
 msgid "UNAVAILABLE"
 msgstr "UTILGÆNGELIG"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 ""
-"Indsæt venligst den følgende disk i drevet \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Venligst indsæt disken navngivet \"%s\" ind i drev \"%s\""
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Fundet "
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Henter "
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Fik "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "Henter ..."
 
@@ -1015,7 +1151,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "Kunne ikke læse liste over pakkekilder"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "Kunne ikke låse katalog med lister ... er du root?"
 
@@ -1027,29 +1163,33 @@
 msgid "View the progress of the package list update"
 msgstr "Vis udvikling ved opdatering af pakkelisten"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "Kunne ikke tømme kataloger for lister"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter hentede filer som er forældede"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Sletter hentede filer som er forældede\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "Kunne ikke åbne %s til at logge handlinger"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "log-rapport"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1059,77 +1199,77 @@
 "VIGTIGT: denne log opregner kun påtænkte handlinger; handlinger som slår\n"
 "fejl pga. problemer med dpkg kan muligvis ikke fuldføres.\n"
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "Vil installere %li pakker, og afinstallere %li pakker.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "%sB diskplads vil blive brugt\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "%sB diskplads vil blive frigjort\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[OPGRADER] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[NEDGRADER] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "AFINSTALLÉR"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "INSTALLÉR"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "GENINSTALLÉR"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "TILBAGEHOLD"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "BRUDTE"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "AFINSTALLÉR, UBRUGTE"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "AFINSTALLÉR, AFHÆNGIGHEDER"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "INSTALLÉR, AFHÆNGIGHEDER"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "TILBAGEHOLD, AFHÆNGIGHEDER"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1140,33 +1280,38 @@
 "\n"
 "Log færdig.\n"
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "Henter pakker"
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Vis udvikling ved download af pakker"
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Pakke: "
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Intern fejl: kunne ikke lave en liste over pakker til download"
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr "Kan ikke korrigere for utilgængelige pakker"
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 "Uff! Der skete noget slemt ved installering af pakker. Prøver at genskabe:"
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "Tryk retur for at fortsætte.\n"
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1227,11 +1372,6 @@
 msgid "[ERROR]"
 msgstr "[FEJL]"
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Venligst indsæt disken navngivet \"%s\" ind i drev \"%s\""
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1271,109 +1411,109 @@
 "Skift disk: Indsæt venligst disken navngivet \"%s\" i drev \"%s\" og tryk "
 "retur\n"
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "Kan ikke åbne Aptitudes fil for udvidet tilstand"
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Læser information om udvidet tilstand"
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "klargører pakketilstande"
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "Kan ikke åbne Aptitudes tilstandsfil"
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "Skriver information om udvidet tilstand"
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr "Internt bufferoverløb på pakke \"%s\" under skrivning af statusfil"
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "Kunne ikke skrive tilstandsfil"
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "Fejl ved skrivning til tilstandsfil"
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "kunne ikke erstatte gammel tilstandsfil"
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 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:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr "Kildelisten til pakker kunne ikke læses"
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 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:1335
+#: src/generic/aptcache.cc:1556
 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:141
+#: 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:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "Kunne ikke erstatte %s med ny opsætningsfil"
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr "Advarsel: kunne ikke låse cachefil. Åbner skrivebeskyttet"
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "Ubalanceret '('"
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Ukendt afhængighedstype: %s"
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Ukendt handlingstype: %s"
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Ukendt prioritetstype: %s"
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Ukendt mønstertype: %c"
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "Uventet tomt udtryk"
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "Forkert udformet udtryk"
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "Uventet ')'"
 
@@ -1396,7 +1536,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "Kan ikke finde værdi på $HOME, bruger TMPDIR (utrygt)"
 
-#: 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 for %s"
@@ -1598,17 +1738,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ugyldig type '%s' på sorteringsmetode"
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s oversat på %s %s\n"
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Oversætter: g++ %s\n"
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
@@ -1617,7 +1757,7 @@
 "\n"
 "NCurses, version: %s\n"
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1626,22 +1766,22 @@
 "\n"
 "Curses, version: %s\n"
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ version: %s\n"
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Brug: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [tilvalg] <handling> ..."
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1650,42 +1790,42 @@
 "  Handlinger (er ingen angivet, vil aptitude gå i interaktiv tilstand):\n"
 "\n"
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Installér/opgradér pakker\n"
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Afinstallér pakker\n"
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Afinstallér pakker og deres opsætningsfiler\n"
 
-#: src/main.cc:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold        - Tilbagehold en pakke\n"
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Fortryd tilbageholdelse af en pakke\n"
 
-#: src/main.cc:94
+#: src/main.cc:93
 #, 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:95
+#: src/main.cc:94
 #, 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:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1694,17 +1834,17 @@
 " forbid-version - Forbyd aptitude at opgradere til en specifik "
 "pakkeversion.\n"
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Hent lister over nye/opgradérbare pakker\n"
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Udfør en sikker opgradering\n"
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1713,75 +1853,75 @@
 " dist-upgrade - Udfør en opgradering, pakker vil muligvis blive installeret "
 "og afinstalleret\n"
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Glem hvilke pakker der er \"nye\"\n"
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, 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:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Vis detaljerede oplysninger om en pakke\n"
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Slet hentede pakkefiler\n"
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Slet gamle, hentede pakkefiler\n"
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Vis en pakkes ændringslog\n"
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Hent en pakkes .deb-fil\n"
 
-#: src/main.cc:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr "  Tilvalg:\n"
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Denne hjælpetekst\n"
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, 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:115
+#: src/main.cc:114
 #, 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:116
+#: src/main.cc:115
 #, 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:117
+#: src/main.cc:116
 #, 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:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1789,63 +1929,63 @@
 msgstr ""
 " -F format      Anfør et format til visning af søgeresultater; se manualen\n"
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, 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:120
+#: src/main.cc:119
 #, 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:121
+#: src/main.cc:120
 #, 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:122
+#: src/main.cc:121
 #, 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:123
+#: src/main.cc:122
 #, 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:124
+#: src/main.cc:123
 #, 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:125
+#: src/main.cc:124
 #, 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:126
+#: src/main.cc:125
 #, 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:127
+#: src/main.cc:126
 #, 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:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1854,58 +1994,66 @@
 " --with(out)-recommends\tAngiv om anbefalede pakker skal behandles som\n"
 "                stærke afhængigheder\n"
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, 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:130
+#: src/main.cc:129
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u     : Hent nye pakkelister under start\n"
 
-#: src/main.cc:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i     : Udfør en installeringskørsel ved opstart\n"
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptitude har ikke \"Super Cow Powers\".\n"
 
-#: src/main.cc:254
+#: src/main.cc:253
 #, 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:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MYSTISK: modtog en ukendt kode for tilvalg\n"
 
-#: src/main.cc:318
+#: src/main.cc:317
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Kun -u eller -i må angives\n"
 
-#: src/main.cc:326
+#: src/main.cc:325
 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:337
+#: src/main.cc:342
 msgid "-u and -i may not be specified with a command"
 msgstr "-u og -i må ikke angives i en kommando"
 
-#: src/main.cc:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ukendt kommando \"%s\"\n"
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Ugyldigt tilvalg for interaktiv tilstand: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
 #: src/mine/cmine.cc:93
 #, c-format
@@ -1933,7 +2081,7 @@
 msgid "Lost"
 msgstr "Tabte"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr "Minestryger"
 
@@ -2110,7 +2258,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr "Pakke"
 
@@ -2369,13 +2517,14 @@
 " Pakker i afsnittet \"base\" bruges ved den første systeminstallering."
 
 #: 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 ""
 "Programmer til faxmodemer og anden hardware til telekommunikation\n"
 " Pakker i afsnittet \"comm\" bruges til at kontrollere modemer og anden "
@@ -2825,14 +2974,15 @@
 "befinder sig derfor nu i \"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"
@@ -2895,11 +3045,12 @@
 " En nyere version af disse pakker er tilgængelig."
 
 #: 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 ""
 "Nye Pakker\n"
 " Disse pakker er føjet til Debian siden sidste gang du nulstillede listen "
@@ -3152,101 +3303,121 @@
 msgid "Versions"
 msgstr "Versioner"
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Ja, jeg er klar over at dette er en meget dårlig idé"
 
 #: src/pkg_item.cc:80
-#, c-format
+#, 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 er en essentiel pakke!\n"
 "\n"
 "Er du sikker på at du vil afinstallere den?\n"
 "Tast '%s' hvis du er sikker."
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "Oplysninger om %s"
 
-#: src/pkg_item.cc:304
-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 "Tilgængelige versioner af "
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versioner"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Afhængigheder for %s"
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 "Pakker der afhænger af %s"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 "Rapporterer en programfejl i %s:\n"
 
-#: src/pkg_item.cc:395
+#: 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 ""
 "Du er ikke root, og det lykkedes ikke at en finde\n"
 "en måde at blive det på. For at genopsætte denne\n"
 "pakke skal pakkerne \"menu\" og \"login\"\n"
 "installeres eller aptitude skal køres som root."
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Genopsætter %s\n"
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Hierarkiredigering"
 
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hierarkiredigering"
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Søg efter: "
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Alle pakker"
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Danner skærmbillede"
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "Ingen pakker passer med mønstret \"%s\"."
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "Indtast en ny grænse for træet over pakker: "
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr "Indtast den nye måde at gruppere pakker på for dette skærmbillede: "
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Indtast en ny sorteringsmetode for pakker i dette skærmbillede: "
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Oplysning om "
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: fejl i parametre - to \"main widgets\"??"
@@ -3262,7 +3433,7 @@
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: forkert argument!"
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: ingen \"main widget\" fundet"
 
@@ -3480,6 +3651,74 @@
 "Følgende pakker afhænger af version %B%s%b af %B%s%b og vil blive brudte "
 "hvis den bliver %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 "Visse pakkeafhængigheder er brudte.  Prøv at reparere dem?"
+
+#: 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 "Giver"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Næste"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Luk"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Følgende pakker er BRUDTE:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Følgende pakker er BRUDTE:"
+
+#: 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 "Følgende pakker er BRUDTE:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Henter pakker"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3491,53 +3730,53 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 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:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Søg efter:"
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr "Du er allerede root!"
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 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:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr "Indlæser cache ..."
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr "Afslut Aptitude?"
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 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:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr "Pakker"
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 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:599
+#: src/ui.cc:666
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3553,15 +3792,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:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3569,60 +3808,70 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Fortsæt"
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Forhåndsvisning af pakkeinstallering"
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Vis og/eller korrigér de handlinger der skal udføres"
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Forrige"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "Visse pakkeafhængigheder var brudte og er blevet repareret"
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Visse brudte pakkeafhængigheder kunne ikke repareres!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "Visse pakkeafhængigheder er brudte.  Prøv at reparere dem?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, 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 ""
 "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:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr "Bliv root"
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr "Bliv ikke root"
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 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:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret."
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3634,164 +3883,179 @@
 "Visse pakker kunne opgraderes, men du har valgt ikke at opgradere dem.\n"
 "Tast \"U\" for at igangsætte en opgradering."
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, 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 ""
 "Opdatering af pakkelisterne kræver administrative rettigheder,\n"
 "som du ikke har lige nu. Vil du ændre bruger til root?\n"
 
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr "Spild tid mens du prøver at finde miner"
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Tømning er ikke tilladt mens der hentes filer"
 
-#: src/ui.cc:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr "Sletter hentede filer"
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr "Hentede pakkefiler er blevet slettet"
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, 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:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, 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
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr "^Installér/afinstallér pakker"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr "Udfør alle afventende installeringer og afinstalleringer"
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr "^Opdatér pakkeliste"
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr "Check efter nye versioner af pakker"
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr "^Glem nye pakker"
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker der er \"nye\""
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr "^Tøm pakkecache"
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr "Slet tidligere hentede pakkefiler"
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr "Slet ^forældede filer"
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slet pakkefiler som ikke længere kan hentes"
 
-#: src/ui.cc:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr "^Marker opgradérbare"
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle ikke-tilbageholdte pakker til opgradering"
 
-#: src/ui.cc:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr "^Spil minestryger"
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr "Bliv ^root"
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, 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 ""
 "Kør \"su\" for at blive root. Dette vil genstarte programmet, men dine\n"
 "indstillinger vil blive bevaret"
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr "^Genindlæs pakkecache"
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr "Genindlæs pakkecachen"
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr "^Afslut"
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr "Afslut programmet"
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 msgid "Undo the last package operation or group of operations"
 msgstr "Fortryd den sidste pakkehandling eller gruppe af handlinger"
 
-#: src/ui.cc:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr "^Installér"
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Markér den aktuelt valgte pakke til installering eller opgradering"
 
-#: src/ui.cc:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr "^Afinstallér"
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr "Markér den aktuelt valgte pakke til afinstallering"
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr "^Udrens"
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 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:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr "Fortryd alle handlinger på den valgte pakke"
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr "^Tilbagehold"
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -3799,251 +4063,255 @@
 "Fortryd alle handlinger på den valgte pakke og beskyt den mod\n"
 "fremtidige opgraderinger"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr "Markér a^uto"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, 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 ""
 "Markér den valgte pakke som værende automatisk installeret;\n"
 "den vil blive afinstalleret automatisk hvis ingen andre pakker\n"
 "afhænger af den"
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr "Markér ^manuel"
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, 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 ""
 "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:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr "^Forbyd version"
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, 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 ""
 "Forbyd at kandidat-versionen af den valgte pakke bliver installeret;\n"
 "nyere versioner af pakken vil blive installeret som sædvanlig"
 
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr "^Oplysning"
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr "Vis flere oplysninger om den valgte pakke"
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr "^Programændringer"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians logfil over programændringer for den valgte pakke"
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr "^Find"
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr "Søg efter en pakke"
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr "Find ^igen"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr "Gentag sidste søgning"
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr "^Afgræns visning"
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr "Anvend et filter på pakkelisten"
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr "^Uafgrænset visning"
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr "Fjern filteret fra pakkelisten"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr "Find ^brudte"
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Find næste pakke med uopfyldte afhængigheder"
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr "^Brugergrænseflade"
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr "Ændr indstillinger som påvirker brugergrænsefladen"
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr "^Afhængigheder"
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 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:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr "^Diverse"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr "Ændr diverse programindstillinger"
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr "^Nulstil indstillinger"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr "Nulstil alle indstillinger til systemets forvalgte"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr "^Næste"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr "Vis næste skærmbillede"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr "^Forrige"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr "Vis forrige skærmbillede"
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr "^Luk"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr "Luk dette skærmbillede"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr "Ny pakke^oversigt"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr "Lav en ny standard for pakkeoversigt"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr "Ny ^kategorivisning"
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr "Vis pakker efter kategori"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr "Vis information om dette program"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr "^Hjælp"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr "Læs online-hjælpen"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr "^Brugervejledning"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr "Vis den detaljerede program-manual"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over ofte stillede spørgsmål"
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^Programændringer"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
 msgstr "Vis vigtige ændringer lavet i hver version af programmet"
 
-#: src/ui.cc:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr "^Licens"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 msgid "View the terms under which you may copy the program"
 msgstr "Læs betingelserne for kopiering af dette program"
 
-#: src/ui.cc:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr "Søg"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "Indstillinger"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr "Skærmbilleder"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, 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:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "ja_taste"
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "nej_taste"
 
@@ -4056,6 +4324,16 @@
 msgid "Downloading Changelog"
 msgstr "Henter Changelog"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Henter 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"
@@ -4084,6 +4362,41 @@
 msgid "No"
 msgstr "Nej"
 
+#~ 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 ""
+#~ "Visse pakker har uopfyldte afhængigheder. Dette kan betyde at du har "
+#~ "ønsket\n"
+#~ "noget som ikke kan opfyldes, eller hvis du bruger distributionen "
+#~ "\"unstable\"\n"
+#~ "at visse påkrævede pakker enten endnu ikke er lavet eller at de er "
+#~ "blevet\n"
+#~ "flyttet ud af \"Incoming\".\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Indsæt venligst den følgende disk i drevet \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Ugyldigt tilvalg for interaktiv tilstand: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Oplysning om "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Visse brudte pakkeafhængigheder kunne ikke repareres!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Programændringer"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Forsvind, jeg forsøger at samle tankerne.\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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +152,103 @@
 "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:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 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:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Abbrechen"
 
+#: 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 "Schlägt vor"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "install"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "install"
+
+#: 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 "aktualis."
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "aktualis."
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "deaktualisiert"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "deaktualisiert"
+
+#: 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 "^Nächste"
+
+#: 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 ""
@@ -236,24 +323,24 @@
 msgstr ""
 "Paket %s kann nicht aktualisiert werden, kann also kein Upgrade verbieten\n"
 
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
 #, 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:240
+#: src/cmdline/cmdline_action.cc:225
 #, 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:246
+#: src/cmdline/cmdline_action.cc:231
 #, 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:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -262,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:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -271,13 +358,13 @@
 "Konnte Paket »%s« nicht finden, aber die folgenden Pakete\n"
 "enthalten »%s« in ihrem Namen:\n"
 
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
 #, 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:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -286,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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -334,13 +421,13 @@
 msgstr "Werde %sB freigeben"
 
 #  Should never happen.
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ungültige Operation: %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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "Abbruch.\n"
@@ -350,7 +437,7 @@
 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:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Konnte Liste der Quellen nicht lesen"
 
@@ -418,99 +505,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:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "Konnte Liste der Paketquellen nicht lesen"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 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:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "aber %s ist installiert."
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 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:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 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:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " oder"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Die folgenden Pakete sind KAPUTT:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 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:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "Die folgenden Pakete werden automatisch zurückgehalten:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Die folgenden Pakete werden zusätzlich automatisch installiert:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Die folgenden Pakete werden automatisch ENTFERNT:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr "Die folgenden Pakete werden zurückgehalten:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "Die folgenden Pakete werden ERNEUT INSTALLIERT:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "Die folgenden Pakete werden zusätzlich installiert:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "Die folgenden Pakete werden ENTFERNT:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "Die folgenden Pakete werden aktualisiert:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Die folgenden ESSENTIELLEN Pakete werden ENTFERNT!\n"
 
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, 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:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -520,97 +607,100 @@
 "beschädigen!\n"
 "         BRECHEN SIE AB, wenn Sie nicht GENAU wissen, was Sie tun!\n"
 
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
 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:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, 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:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, 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:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, 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:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, 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:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu Pakete aktualisiert, %lu zusätzlich installiert, "
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu erneut installiert, "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu deaktualisiert, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, 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:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Muss %sB/%sB an Archiven herunterladen."
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Muss %sB an Archiven herunterladen."
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, 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:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Nach dem Entpacken werden %sB frei werden.\n"
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: 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:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "Drücken Sie zum Fortsetzen die Eingabetaste."
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, 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:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Drücken Sie zum Fortsetzen die Eingabetaste."
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Wollen Sie fortsetzen? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -621,7 +711,7 @@
 "Abhängigkeiten werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -632,7 +722,7 @@
 "Abhängigkeiten werden nicht angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -643,7 +733,7 @@
 "Versionen werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -654,7 +744,7 @@
 "Versionen werden nicht angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -665,7 +755,7 @@
 "Größenveränderungen werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +766,7 @@
 "Größenveränderungen werden nicht angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -727,37 +817,89 @@
 "  _ : Vollständig entfernen (»purge«, auch Konfigurationsdateien löschen)\n"
 "  = : Zurückhalten\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, 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
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Aptitude verlassen"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Die folgenden Pakete sind KAPUTT:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: Sie müssen einen Suchbegriff angeben\n"
 
-#  Use apt-get's familiar error message,
-#  Use apt-get's familiar error message,
-#  Use apt-get's familiar error message,
-#: 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 ""
-"Die Abhängigkeiten einiger Pakete sind nicht erfüllt.  Das kann bedeuten,\n"
-"dass Sie eine unmögliche Auswahl getroffen haben oder (falls Sie die\n"
-"»unstable«-Distribution verwenden), dass einige erforderliche Pakete\n"
-"fehlen oder aktualisiert werden müssen.\n"
-"\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 "Die folgenden Pakete haben verletzte Abhängigkeiten:\n"
@@ -955,12 +1097,12 @@
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Würde Pakete herunterladen/installieren/entfernen.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Interner Fehler: Sortierung nicht abgeschlossen"
 
@@ -1007,28 +1149,24 @@
 msgid "UNAVAILABLE"
 msgstr "NICHT VERFÃœGBAR"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 ""
-"Bitte legen Sie folgenden Datenträger in das Laufwerk »%s« ein:\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Bitte legen Sie den Datenträger »%s« in das Laufwerk »%s« ein"
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Treffer "
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Herunterladen von "
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Habe "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "Ladend..."
 
@@ -1038,7 +1176,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "Konnte Liste der Paketquellen nicht lesen"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "Konnte Listenverzeichnis nicht sperren.  Sind Sie »root«?"
 
@@ -1050,29 +1188,33 @@
 msgid "View the progress of the package list update"
 msgstr "Den Fortschritt des Paketlistendownloads anzeigen"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "Konnte Listenverzeichnisse nicht aufräumen"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "Lösche veraltete heruntergeladene Dateien"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Lösche veraltete heruntergeladene Dateien\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "%s konnte nicht geöffnet werden um Aktionen zu protokollieren"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "Protokoll"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1084,77 +1226,77 @@
 "dpkg-Problemen fehlschlagen sind vielleicht nicht abgeschlossen.\n"
 "\n"
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "Werde %li Pakete installieren und %li Pakete entfernen.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "%sB werden auf der Festplatte belegt werden\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "%sB werden auf der Festplatte freigegeben werden\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[UPGRADE] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[DOWNGRADE] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "ENTFERNEN"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "INSTALLIEREN"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "NEUINST."
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "HALTEN"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "KAPUTT"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "ENTFERNEN, NICHT VERWENDET"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "ENTFERNEN, ABHÄNGIGKEITEN"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "INSTALLIEREN, ABHÄNGIGKEITEN"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "HALTEN, ABHÄNGIGKEITEN"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1165,35 +1307,40 @@
 "\n"
 "Protokoll abgeschlossen.\n"
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "Herunterladen von Paketen"
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Den Fortschritt des Paketdownloads anzeigen"
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paket: "
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Interner Fehler: Liste der herunterzuladenden Pakete konnte nicht erzeugt "
 "werden"
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr "Konnte nicht verfügbare Pakete nicht ersetzen"
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 "Während der Paketinstallation sind Probleme aufgetreten.  Versuche zu lösen:"
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "Drücken Sie zum Fortsetzen die Eingabetaste.\n"
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1255,11 +1402,6 @@
 msgid "[ERROR]"
 msgstr "[FEHLER]"
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Bitte legen Sie den Datenträger »%s« in das Laufwerk »%s« ein"
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1299,116 +1441,116 @@
 "Medienwechsel: Bitte legen Sie den Datenträger »%s« in das Laufwerk »%s« ein "
 "und drücken Sie die Eingabetaste.\n"
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "Kann Aptitudes erweiterte Statusdatei nicht öffnen"
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Lese erweiterte Statusinformationen"
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Initialisiere Paketstatus"
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "Kann Aptitudes Statusdatei nicht öffnen"
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "Schreibe erweiterte Statusinformation"
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 "Interner Pufferüberlauf im Paket »%s« während dem Schreiben der Statusdatei"
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "Konnte Statusdatei nicht schreiben"
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "Fehler beim Schreiben der Statusdatei"
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "Konnte alte Statusdatei nicht ersetzen"
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 "Konnte Abhängigkeiten nicht korrigieren, manche Pakete können nicht "
 "installiert werden"
 
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 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:1335
+#: src/generic/aptcache.cc:1556
 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:141
+#: 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:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "Konnte %s nicht durch neue Konfigurationsdatei ersetzen"
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 "Warnung:  Konnte Cache-Datei nicht sperren.  Öffne Sie jetzt schreibgeschützt"
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "Offene '('"
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Unbekannter Abhängigkeitstyp: %s"
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Unbekannter Aktionstyp %s"
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Unbekannte Priorität %s"
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Unbekannter Mustertyp: %c"
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "Unerwarteter leerer Ausdruck"
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "Ungültiger Ausdruck"
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "Unerwartete ')'"
 
@@ -1431,7 +1573,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "Kann Wert von $HOME nicht lesen, verwende TMPDIR (unsicher)"
 
-#: 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 für %s"
@@ -1638,17 +1780,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ungültiger Sortierregel-Typ '%s'"
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompiliert am %s %s\n"
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compiler: g++ %s\n"
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
@@ -1657,7 +1799,7 @@
 "\n"
 "NCurses-Version: %s\n"
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1666,81 +1808,81 @@
 "\n"
 "Curses-Version: %s\n"
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++-Version: %s\n"
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Verwendung: aptitude [-S dname] [-u|-i]"
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "            aptitude [Optionen] <Aktion> ..."
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, 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:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install        Installiere/Aktualisiere Pakete\n"
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove         Entferne Pakete\n"
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge          Entferne Pakete und ihre Konfigurationsdateien\n"
 
-#: src/main.cc:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold           Pakete auf »zurückhalten« setzen\n"
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold         Einen »hold«-Befehl zurücknehmen\n"
 
-#: src/main.cc:94
+#: src/main.cc:93
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto       Pakete als automatisch installiert markieren\n"
 
-#: src/main.cc:95
+#: src/main.cc:94
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto     Pakete als manuell installiert markieren\n"
 
-#: src/main.cc:100
+#: src/main.cc:99
 #, 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:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update         Neue Listen neuer/aktualisierbarer Paketen laden\n"
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade        Sicheres Upgrade durchführen\n"
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1749,58 +1891,58 @@
 " dist-upgrade   Upgrade durchführen, dabei ggf. Pakete installieren/"
 "entfernen\n"
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new     Vergessen welche Pakete »neu« sind\n"
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, 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:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show           Details über ein Paket anzeigen\n"
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean          Heruntergeladene Pakete löschen\n"
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean      Alte heruntergeladene Pakete löschen\n"
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog      Änderungsprotokoll eines Pakets\n"
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download       Die .deb-Datei eines Pakets herunterladen\n"
 
-#: src/main.cc:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr "Optionen:\n"
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Dieser Hilfetext\n"
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, 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:115
+#: src/main.cc:114
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1808,12 +1950,12 @@
 " -d             Pakete nur herunterladen, nichts installieren oder "
 "entfernen.\n"
 
-#: src/main.cc:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Immer zur Bestätigung nachfragen\n"
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1821,7 +1963,7 @@
 " -y             Annehmen, dass die Antwort auf einfache ja/nein-Fragen \"ja"
 "\" ist\n"
 
-#: src/main.cc:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1829,7 +1971,7 @@
 msgstr ""
 " -F format      Format für die Suchergebnisse angeben;  vgl. Anleitung\n"
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1837,37 +1979,37 @@
 " -O order       Wie die Suchergebnisse sortiert werden sollen;  vgl. "
 "Anleitung\n"
 
-#: src/main.cc:120
+#: src/main.cc:119
 #, 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:121
+#: src/main.cc:120
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Aggressiv versuchen kaputte Pakete zu reparieren.\n"
 
-#: src/main.cc:122
+#: src/main.cc:121
 #, 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:123
+#: src/main.cc:122
 #, 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:124
+#: src/main.cc:123
 #, 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:125
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -1875,7 +2017,7 @@
 " -v             Mehr Informationen ausgeben (kann mehrfach verwendet "
 "werden)\n"
 
-#: src/main.cc:126
+#: src/main.cc:125
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -1883,12 +2025,12 @@
 " -t [release]   Das »Release«, aus dem Pakete installiert werden sollen\n"
 "                (z.B. stable, unstable, sarge, ...)\n"
 
-#: src/main.cc:127
+#: src/main.cc:126
 #, 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:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1898,61 +2040,69 @@
 "                Angeben, ob »Empfehlungen« wie starke\n"
 "                Abhängigkeiten gehandhabt werden sollen\n"
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, 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:130
+#: src/main.cc:129
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u             Neue Paketlisten beim Start laden.\n"
 
-#: src/main.cc:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i             Installationslauf am Anfang durchführen.\n"
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, 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:254
+#: src/main.cc:253
 #, 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:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MERKWÃœRDIG: unbekannten Optionscode erhalten\n"
 
-#: src/main.cc:318
+#: src/main.cc:317
 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:326
+#: src/main.cc:325
 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:337
+#: src/main.cc:342
 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:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Unbekanntes Kommando »%s«\n"
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Unbekannte Option für den Interaktiven Modus: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
 #: src/mine/cmine.cc:93
 #, c-format
@@ -1980,7 +2130,7 @@
 msgid "Lost"
 msgstr "Verloren"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr "Minesweeper"
 
@@ -2192,7 +2342,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr "Paket"
 
@@ -2456,13 +2606,14 @@
 " Pakete im Bereich »base« sind Teil der Erstinstallation von Debian."
 
 #: 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 ""
 "Programme für Faxmodems und andere Kommunikationsgeräte\n"
 " Pakete im Bereich »comm« werden verwendet, um Modems und andere "
@@ -2906,14 +3057,15 @@
 "die früher in »non-us« beheimatet waren, sind jetzt »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"
@@ -2975,11 +3127,12 @@
 " Eine neuere Version dieser Pakete ist verfügbar."
 
 #: 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 ""
 "Neue Pakete\n"
 " Diese Pakete sind neu zu Debian hinzugekommen, seit Sie das letzte Mal die "
@@ -3232,17 +3385,15 @@
 msgid "Versions"
 msgstr "Versionen"
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Mir·ist·klar,·dass·das·eine·sehr·schlechte·Idee·ist."
 
 #: src/pkg_item.cc:80
-#, c-format
+#, 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 ist ein essentielles Paket!\n"
 "\n"
@@ -3250,77 +3401,103 @@
 "Geben Sie '%s' ein."
 
 # ummmm...
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "Informationen über %s"
 
-#: src/pkg_item.cc:304
-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 "Verfügbare Versionen von "
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versionen"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Abhängigkeiten von %s"
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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, die von %s abhängen"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 "Einen Fehler in %s melden:\n"
 
-#: src/pkg_item.cc:395
+#: 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 ""
 "Sie sind nicht root und ich kann keinen Weg finden,\n"
 "root zu werden.  Um dieses Paket neu zu konfigurieren,\n"
 "installieren Sie die Pakete »menu« und »login«\n"
 "oder führen Sie Aptitude als root aus."
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Neukonfigurieren von %s\n"
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Hierarchie-Editor"
 
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Hierarchie-Editor"
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Suche nach: "
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Alle Pakete"
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Ansicht aufbauen"
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "Keine Pakete passen zum Suchmuster »%s«."
 
 # (Verb for "enter" in computer contexts appears to be "eingeben", which makes
 #  some sense..)
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "Suchmuster zum Filtern des Paketbaums: "
 
 # (Verb for "enter" in computer contexts appears to be "eingeben", which makes
 #  some sense..)
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr ""
 "Geben Sie bitte den neuen Paketgruppierungs-Mechanismus für diese Ansicht "
@@ -3328,16 +3505,11 @@
 
 # (Verb for "enter" in computer contexts appears to be "eingeben", which makes
 #  some sense..)
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 "Geben Sie bitte den neuen Paketsortierungs-Mechanismus für dies Ansicht ein: "
 
-# ummmm...
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Information über "
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: error in arguments -- two main widgets??"
@@ -3352,7 +3524,7 @@
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: bad argument!"
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: no main widget found"
 
@@ -3577,6 +3749,74 @@
 "Die folgenden Pakete hängen ab von Version %B%s%b des Pakets %B%s%b, und "
 "werden kaputt sein, wenn es %s wird."
 
+#: 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 "Manche Pakete sind kaputt.  Versuchen, das zu reparieren?"
+
+#: 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 "Liefert"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Nächste"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Schließen"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Die folgenden Pakete sind KAPUTT:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Die folgenden Pakete sind KAPUTT:"
+
+#: 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 "Die folgenden Pakete sind KAPUTT:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Herunterladen von Paketen"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3588,53 +3828,53 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 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:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Suchen nach:"
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr "Sie sind bereits root!"
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr "Unterprozess mit Fehler beendet -- richtiges Passwort?"
 
-#: src/ui.cc:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr "Lade Cache"
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr "Aptitude wirklich beenden?"
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Wirklich ihre persönlichen Einstellungen verwerfen und Standardwerte laden?"
 
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr "Pakete"
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 msgid "View available packages and choose actions to perform"
 msgstr "Verfügbare Pakete anzeigen und Änderungen vornehmen"
 
-#: src/ui.cc:599
+#: src/ui.cc:666
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3653,15 +3893,15 @@
 "unter bestimmten Bedingungen weiterzuvertreiben;  Details dazu finden Sie\n"
 "ebenfalls unter »Lizenz«."
 
-#: src/ui.cc:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr "help-de.txt"
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3669,62 +3909,72 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Weiter"
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Vorschau der Paketinstallation"
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Anzeigen und anpassen der geplanten Aktionen"
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Vorherige"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "Manche Pakete waren kaputt und wurden repariert"
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Manche kaputten Pakete konnten nicht repariert werden!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "Manche Pakete sind kaputt.  Versuchen, das zu reparieren?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, 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 ""
 "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:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr "»root« werden"
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr "Nicht »root« werden"
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 msgid "A package-list update or install run is already taking place."
 msgstr "Ein Aktualisierungs oder Installationsvorgang findet gerade statt."
 
-#: src/ui.cc:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Es wurden keine Pakete zum Installieren, Entfernen oder Aktualisieren "
 "ausgewählt."
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3737,170 +3987,185 @@
 "ausgewählt.\n"
 "Geben Sie »Umschalt+U« ein, um diese Pakete zu aktualisieren."
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, 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 ""
 "Zum Aktualisieren der Paketliste sind Administrationsrechte nötig,\n"
 "die Sie derzeit nicht haben.  Wollen Sie zum root-Account wechseln?\n"
 
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr "Zeit verschwenden (Minensuchspiel)"
 
 #  Erk!  That's weird!
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 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:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr "Lösche heruntergeladene Dateien"
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr "Heruntergeladene Dateien wurden gelöscht"
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, 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:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Zeit verschwenden (Minensuchspiel)"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr "^Installieren/Entfernen von Paketen"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr "Durchführen geplanter Installations- und Löschvorgänge"
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr "Paketliste ^aktualisieren"
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 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:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr "Neue Pakete ^vergessen"
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr "Vergessen, welche Pakete »neu« sind"
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr "Paketcache komplett leeren"
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr "Alle Paketdateien aus dem Paketcache löschen"
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr "Nur ^veraltete Paketdateien löschen"
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 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:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr "Aktualisierbare ^markieren"
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 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:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr "^Minesweeper spielen"
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr "^Root werden"
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, 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 ""
 "'su' ausführen um root zu werden.  Dies wird das Programm neu starten, aber\n"
 "Ihre Einstellungen werden erhalten bleiben."
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr "Paketcache ^neu laden"
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr "Paketcache neu laden"
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr "^Beenden"
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr "Aptitude verlassen"
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 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:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr "^Installieren"
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 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:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr "^Entfernen"
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr "Das ausgewählte Paket zum Entfernen auswählen"
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr "^Vollständig entfernen"
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 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:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr "^Beibehalten"
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr "Alle Aktionen mit dem gewählten Paket zurücknehmen"
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr "^Zurückhalten"
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -3908,243 +4173,247 @@
 "Geplante Vorgänge mit dem gewählten Paket zurücknehmen und\n"
 "es vor zukünftigen Upgrades schützen"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr "Als ^automatisch markieren"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, 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 ""
 "Dieses Paket als automatisch installiert markieren;\n"
 "es wird dann automatisch gelöscht, wenn keine anderen Pakete mehr davon "
 "abhängen"
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr "Als ^manuell markieren"
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, 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 ""
 "Dieses Paket als manuell installiert markieren;\n"
 "es wird dann nur noch auf Ihren Wunsch hin gelöscht."
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr "Version verbieten"
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, 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 ""
 "Die Installation der anstehenden Version dieses Pakets verbieten;\n"
 "noch neuere Versionen werden wie üblich installiert werden"
 
 # ummmm...
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr "Informationen"
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr "Mehr Informationen zum gewählten Paket"
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr "Das Debian-Änderungsprotokoll für das gewählte Paket anzeigen"
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr "^Suchen"
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr "Nach einem Paket suchen"
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr "^Weitersuchen"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr "Die letzte Suche wiederholen"
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr "^Filtern des Paketbaums"
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr "Einen Filter auf die Paketliste anwenden"
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr "^Löschen des Filters"
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr "Die Paketliste nicht mehr filtern"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr "Kaputtes Paket suchen"
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Das nächste Paket mit verletzten Abhängigkeiten finden"
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr "^Oberfläche"
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr "Einstellungen verändern, die die Benutzeroberfläche betreffen"
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr "^Abhängigkeisbehandlung"
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 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:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr "^Verschiedenes"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr "Sonstige Programmeinstellungen ändern"
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr "^Optionen zurücksetzen"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr "Alle Einstellungen auf die Vorgabewerte zurücksetzen"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr "^Nächste"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr "Nächste Ansicht zeigen"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr "^Vorherige"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr "Vorherige Ansicht zeigen"
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr "^Schließen"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr "Ansicht schließen"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr "Neue Paket^ansicht"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr "Eine neue Paketansicht erzeugen"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr "Neuen Kategorie-^Browser"
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr "Pakete nach Kategorie durchsuchen"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr "Ü^ber"
 
 # ummmm...
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr "Information über Aptitude"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr "K^urzhilfe"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr "Kurzhilfe zu Aptitude"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr "^Anleitung"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr "Die detaillierte Anleitung (README, derzeit nur englisch)"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr "Die Liste häufig gestellter Fragen (Frequently Asked Questions, FAQ)"
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^ChangeLog"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
 msgstr "Protokoll der Änderungen, die an Aptitude vorgenommen wurden"
 
-#: src/ui.cc:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr "Lizen^z"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 msgid "View the terms under which you may copy the program"
 msgstr "Die Bedingungen, unter denen Sie Aptitude kopieren dürfen"
 
-#: src/ui.cc:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr "Suchen"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "Optionen"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr "Ansichten"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, c-format
 msgid ""
 "%s: Menu  %s: Help  %s: Quit  %s: Update  %s: Download/Install/Remove Pkgs"
@@ -4152,11 +4421,11 @@
 "%s: Menü  %s: Hilfe  %s: Beenden  %s: Update  %s: Download/Installieren/"
 "Entf. von Paketen"
 
-#: src/ui.cc:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "n"
 
@@ -4170,6 +4439,16 @@
 msgid "Downloading Changelog"
 msgstr "Herunterladen des Changelogs"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Herunterladen des Changelogs"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
@@ -4197,3 +4476,40 @@
 #: src/vscreen/vs_util.cc:175 src/vscreen/vs_util.cc:212
 msgid "No"
 msgstr "Nein"
+
+#  Use apt-get's familiar error message,
+#  Use apt-get's familiar error message,
+#  Use apt-get's familiar error message,
+#~ 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 ""
+#~ "Die Abhängigkeiten einiger Pakete sind nicht erfüllt.  Das kann "
+#~ "bedeuten,\n"
+#~ "dass Sie eine unmögliche Auswahl getroffen haben oder (falls Sie die\n"
+#~ "»unstable«-Distribution verwenden), dass einige erforderliche Pakete\n"
+#~ "fehlen oder aktualisiert werden müssen.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Bitte legen Sie folgenden Datenträger in das Laufwerk »%s« ein:\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Unbekannte Option für den Interaktiven Modus: -s\n"
+
+# ummmm...
+#~ msgid "Information about "
+#~ msgstr "Information über "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Manche kaputten Pakete konnten nicht repariert werden!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^ChangeLog"

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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +171,103 @@
 "Αυτόματη αφαίρεση αχρησιμοποιήτων πακέτων που ταιριάζουν σε αυτό το φίλτρο"
 
 #: src/apt_options.cc:241 src/mine/cmine.cc:255 src/mine/cmine.cc:328
-#: src/ui.cc:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Εντάξει"
 
 #: 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:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Ακύρωση"
 
+#: 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 "Προτείνει"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "εγκατάσταση"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "εγκατάσταση"
+
+#: 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 "αναβάθμιση"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "αναβάθμιση"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "υποβαθμίζονται"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "υποβαθμίζονται"
+
+#: 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 "^Επόμενο"
+
+#: 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 ""
@@ -254,25 +341,25 @@
 msgstr ""
 "Το πακέτο %s δεν είναι αναβαθμίσιμο, δεν μπορεί να απαγορευτεί αναβάθμιση\n"
 
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr "Σημείωση: επιλέχθηκε ο σκοπός \"%s: %s\" για εγκατάσταση\n"
 
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:225
 #, c-format
 msgid "You can only specify a package version with an 'install' command.\n"
 msgstr ""
 "Δεν μπορείτε να καθορίσετε έκδοση πακέτου με την εντολή εγκατάστασης.\n"
 
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:231
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 "Δεν μπορείτε να καθορίσετε όνομα αρχείου πακέτου με την εντολή "
 "εγκατάστασης.\n"
 
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -281,7 +368,7 @@
 "Δεν βρέθηκε το πακέτο \"%s\", και περισσότερα από 40\n"
 "πακέτα περιέχουν το \"%s\" στο όνομά τους.\n"
 
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -290,12 +377,12 @@
 "Δεν βρέθηκε το πακέτο \"%s\".  Πάραυτα τα ακόλουθα\n"
 "πακέτα περιέχουν \"%s\" στο όνομά τους:\n"
 
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Δεν βρέθηκε πακέτο με όνομα ή περιγραφή που να ταιριάζει στο \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -304,7 +391,7 @@
 "Δεν βρέθηκε πακέτο να ταιριάζει στο \"%s\", και περισσότερα από 40\n"
 "πακέτα περιέχουν το \"%s\" στην περιγραφή τους.\n"
 
-#: src/cmdline/cmdline_action.cc:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -349,13 +436,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "Θα ελευθερώσει %sB χώρο στο δίσκο"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ακυρη λειτουργία %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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "Εγκατάλειψη.\n"
@@ -366,7 +453,7 @@
 msgstr ""
 "μεταφόρτωση: θα πρέπει να καθορίσετε ένα τουλάχιστον πακέτο για κατέβασμα\n"
 
-#: src/cmdline/cmdline_download.cc:43 src/download.cc:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών  "
 
@@ -432,96 +519,96 @@
 msgid "What is it?  It's an elephant being eaten by a snake, of course.\n"
 msgstr "Τι είναι;  Είναι ένα ελεφαντοειδές που το τρώει ένα φίδι, φυσικά.\n"
 
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "Αδύνατη η ανάγνωση του καταλόγου των πηγών"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr "αλλά θα εγκατασταθεί το %s."
 
-#: src/cmdline/cmdline_prompt.cc:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "αλλά το %s είναι εγκατεστημένο."
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 src/cmdline/cmdline_show_broken.cc:83
 #, c-format
 msgid "but it is not installable"
 msgstr "αλλά δεν είναι εγκατάστασιμο"
 
-#: src/cmdline/cmdline_prompt.cc:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 src/cmdline/cmdline_show_broken.cc:87
 #, c-format
 msgid " which is a virtual package."
 msgstr " το οποίο είναι ένα εικονικό πακέτο."
 
-#: src/cmdline/cmdline_prompt.cc:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " ή"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 msgid "The following packages are unused and will be REMOVED:"
 msgstr "Τα ακόλουθα πακέτα δεν χρειάζονται και θα ΑΦΑΙΡΕΘΟΥΝ:"
 
-#: src/cmdline/cmdline_prompt.cc:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "Τα ακόλουθα πακέτα εξαιρέθηκαν αυτόματα:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν αυτόματα:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ αυτόματα:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ αυτόματα:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr "Τα ακόλουθα πακέτα έχουν εξαιρεθεί:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "Τα ακόλουθα πακέτα θα ΕΠΑΝΕΓΚΑΤΑΣΤΑΘΟΥΝ:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Τα ακόλουθα ΑΠΑΡΑΙΤΗΤΑ πακέτα θα ΑΦΑΙΡΕΘΟΥΝ!\n"
 
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Τα ακόλουθα ΑΠΑΡΑΙΤΗΤΑ πακέτα θα γίνουν ΕΛΑΤΩΜΑΤΙΚΑ από αυτή την ενέργεια:\n"
 
-#: src/cmdline/cmdline_prompt.cc:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -530,98 +617,101 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτή η ενέργεια θα προξενήσει δυσλειτουργίες στο σύστημα!\n"
 "         ΜΗΝ συνεχίσετε εκτός αν γνωρίζετε ΑΚΡΙΒΩΣ τι κάνετε!\n"
 
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
 msgid "I am aware that this is a very bad idea"
 msgstr "Ναι γνωρίζω ότι είναι μια πολύ κακή ιδέα"
 
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Για να συνεχίσετε, πληκτρολογήστε την φράση \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Τα ακόλουθα πακέτα είναι ΠΡΟΤΕΙΝΟΜΕΝΑ αλλά ΔΕΝ θα εγκατασταθούν:\n"
 
-#: src/cmdline/cmdline_prompt.cc:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Τα ακόλουθα πακέτα είναι ΠΡΟΤΕΙΝΟΜΕΝΑ αλλά ΔΕΝ θα εγκατασταθούν:\n"
 
-#: src/cmdline/cmdline_prompt.cc:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Δεν θα εγκατασταθούν, αναβαθμιστούν ή αφαιρεθούν πακέτα.\n"
 
-#: src/cmdline/cmdline_prompt.cc:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu πακέτα αναβαθμίζονται, %lu νέο-εγκατεστημένα, "
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu επενεγκατεστημένα, "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu υποβαθμισμένα, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu για αφαίρεση και %lu δεν αναβαθμίστηκαν.\n"
 
-#: src/cmdline/cmdline_prompt.cc:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Χρειάζεται να κατεβούν %sB/%sB αρχείων. "
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Χρειάζεται να κατεβούν %sB αρχείων. "
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Κακός χαρακτήρας ενέργειας '%c'\n"
 
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "Πατήστε Return για συνέχεια"
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Δεν βρέθηκαν πακέτα -- γράψτε τα ονόματα των πακέτων μετά το 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Πατήστε Return για συνέχεια"
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Θέλετε να συνεχίσετε ; [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -632,7 +722,7 @@
 "Θα εμφανιστούν πληροφορίες εξαρτήσεων.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -643,7 +733,7 @@
 "Δεν θα εμφανιστούν πληροφορίες εξαρτήσεων.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -654,7 +744,7 @@
 "Θα εμφανιστούν πληροφορίες εκδόσεων.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -665,7 +755,7 @@
 "Δεν θα εμφανιστούν πληροφορίες εκδόσεων.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +766,7 @@
 "Θα εμφανιστούν πληροφορίες αλλαγής μεγεθών.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -687,7 +777,7 @@
 "Δεν θα εμφανιστούν πληροφορίες αλλαγής μεγεθών.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -736,33 +826,86 @@
 "  _ : Διαγραφή\n"
 "  = : Κράτημα\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Ακυρη απάντηση.  Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
 
+#: src/cmdline/cmdline_resolver.cc:84
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Έξοδος από το πρόγραμμα"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, fuzzy
+msgid "The following actions will resolve these dependencies:"
+msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:\n"
+
+#: src/cmdline/cmdline_resolver.cc:146
+msgid "Accept this solution? [Y/n/q/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, fuzzy
+msgid "Invalid response; please enter one of the following commands:"
+msgstr ""
+"Ακυρη απάντηση.  Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
+
+#: src/cmdline/cmdline_resolver.cc:198
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, fuzzy
+msgid "Invalid response; please enter 'y' or 'n'."
+msgstr ""
+"Ακυρη απάντηση.  Παρακαλώ εισάγετε μια έγκυρη εντολή ή '?' για βοήθεια.\n"
+
+#: src/cmdline/cmdline_resolver.cc:235
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "αναζήτηση: Θα πρέπει να ορίσετε ένα τουλάχιστον αντικείμενο\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 ""
-"Μερικά πακέτα είναι αδύνατον να εγκατασταθούν. Αυτό μπορεί να σημαίνει ότι\n"
-"δημιουργήσατε μια απίθανη κατάσταση ή αν χρησιμοποιείτε την ασταθή\n"
-"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
-"μετακινηθεί από τα εισερχόμενα.\n"
-"\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 "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:\n"
@@ -960,12 +1103,12 @@
 msgid "Description: "
 msgstr "Περιγραφή: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Θα κατεβούν/εγκατασταθούν/αφαιρεθούν πακέτα.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Εσωτερικό Σφάλμα, Η ταξινόμηση δεν τελείωσε"
 
@@ -1007,28 +1150,24 @@
 msgid "UNAVAILABLE"
 msgstr "ΜΗ ΔΙΑΘΕΣΙΜΑ"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 ""
-"Παρακαλώ τοποθετήστε τον ακόλουθο δίσκο στη μονάδα \"%s\":\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Παρακαλώ εισάγετε το δίσκο με ετικέτα \"%s\" στη μονάδα CD-ROM \"%s\"."
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Επιτυχία "
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Μεταφόρτωση του "
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Μεταφορτώθηκε το "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "Μεταφόρτωση..."
 
@@ -1036,7 +1175,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "Δεν ήταν δυνατή η ανάγνωση των πηγαίων πακέτων"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "Αδύνατο το κλείδωμα του φακέλου της λίστας ... είστε root;"
 
@@ -1048,29 +1187,33 @@
 msgid "View the progress of the package list update"
 msgstr "Εμφάνιση προόδου της διαδικασίας ανανέωσης πακέτων"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "Αδύνατο ο καθαρισμός του φακέλου της λίστας"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "Διαγράφονται τα περιττά μεταφορτωμένα αρχεία"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Διαγράφονται τα απαρχαιωμένα μεταφορτωμένα αρχεία\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "Αδύνατο το άνοιγμα του %s για την καταγραφή ενεργειών"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "αναφορά σφαλμάτων"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1082,77 +1225,77 @@
 "που αποτυγχάνουν εξαιτίας προβλημάτων του dpkg δεν θα ολοκληρωθούν.\n"
 "\n"
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "Θα εγκαταστήσει %li πακέτα, και θα αφαιρέσει %li πακέτα.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "%sB χώρος από το σκληρό δίσκο θα χρησιμοποιηθούν\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "%sB bytes από το σκληρό δίσκο θα απελευθερωθούν\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[ΑΝΑΒΑΘΜΙΣΗ] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[ΥΠΟΒΑΘΜΙΣΗ] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "ΑΦΑΙΡΕΣΗ"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "ΕΓΚΑΤΑΣΤΑΣΗ"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "ΕΠΑΝΕΓΚΑΤΑΣΤΑΣΗ"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "ΑΝΑΜΟΝΗ"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "ΣΠΑΣΜΕΝΑ"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "ΑΦΑΙΡΕΣΗ, ΜΗ ΧΡΗΣΗΜΟΠΟΙΗΜΕΝΑ"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "ΑΦΑΙΡΕΣΗ, ΕΞΑΡΤΗΣΕΙΣ"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "ΕΓΚΑΤΑΣΤΑΣΗ, ΕΞΑΡΤΗΣΕΙΣ"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "ΑΝΑΜΟΝΗ, ΕΞΑΡΤΗΣΕΙΣ"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1163,36 +1306,41 @@
 "\n"
 "Η καταγραφή ολοκληρώθηκε.\n"
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "Μεταφόρτωση πακέτων"
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Εμφάνιση προόδου της διαδικασίας μεταφόρτωσης πακέτου"
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Πακέτο: "
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Εσωτερικό σφάλμα: δεν ήταν δυνατή η δημιουργία της λίστας μεταφόρτωσης "
 "πακέτων "
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr "Αδυναμία διόρθωσης των μη διαθέσιμων πακέτων"
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 "Φτού! Κάτι κακό συνέβη κατά την εγκατάσταση των πακέτων. Προσπάθεια "
 "επαναφοράς:"
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "Πατήστε enter για συνέχεια.\n"
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1253,11 +1401,6 @@
 msgid "[ERROR]"
 msgstr "[ΣΦΑΛΜΑ]"
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Παρακαλώ εισάγετε το δίσκο με ετικέτα \"%s\" στη μονάδα CD-ROM \"%s\"."
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1297,117 +1440,117 @@
 "Αλλαγή Μέσου: Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη μονάδα '%s' και "
 "πιέστε enter\n"
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου λεπτομερούς κατάστασης του Aptitude"
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Ανάκτηση των δεδομένων λεπτομερούς κατάστασης"
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Αρχικοποίηση κατάστασης πακέτων"
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου κατάστασης του Aptitude"
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "Αποθήκευση δεδομένων λεπτομερούς κατάστασης"
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 "Εσωτερική υπερχείλιση στο πακέτο \"%s\" κατά την εγγραφή του αρχείου "
 "κατάστασης"
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "Αδύνατη η εγγραφή στο αρχείο κατάστασης"
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "Σφάλμα κατά την εγγραφή στο αρχείο κατάστασης"
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "αδύνατη η αντικατάσταση του υπάρχοντος αρχείου κατάστασης"
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 "Αδύνατη η διόρθωση των εξαρτήσεων, κάποια πακέτα δεν μπορούν να εγκατασταθούν"
 
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
 
-#: src/generic/aptcache.cc:1335
+#: src/generic/aptcache.cc:1556
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 "Ίσως να χρειαστεί να ενημερώσετε τις λίστες των πακέτων για να διορθώσετε "
 "αυτά τα αγνοούμενα αρχεία."
 
-#: src/generic/apt.cc:141
+#: src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή"
 
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "Αδύνατη η αντικατάσταση του %s με νέο αρχείο ρυθμίσεων"
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 "Προειδοποίηση: Αδύνατο το κλείδωμα του αρχείου cache.  Θα ανοιχτεί μόνο για "
 "ανάγνωση."
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "Αταίριαστη '('"
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Άγνωστος τύπος εξάρτησης: %s"
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Άγνωστος τύπος εργασίας: %s"
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Άγνωστη προτεραιότητα %s"
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Άγνωστος τύπος κανονικής παράστασης: %c"
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "Μη αναμενόμενη κενή παράσταση"
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "Λάθος διαμορφωμένη παράσταση"
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "Μή αναμενόμενη ')'"
 
@@ -1431,7 +1574,7 @@
 msgstr ""
 "Δεν μπορεί να βρεθεί η τιμή του $HOME, με τη χρήση του TMPDIR (ανασφαλές)"
 
-#: 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 "Αρχείο Αλλαγής του %s"
@@ -1638,17 +1781,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Μη έγκυρη πολιτική ταξινόμησης '%s'"
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s μεταγλωττίστηκε στις %s %s\n"
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Πρόγραμμα μεταγλώττισης : g++ %s\n"
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
@@ -1657,7 +1800,7 @@
 "\n"
 "Εκδοση NCurses: %s\n"
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1666,22 +1809,22 @@
 "\n"
 "Εκδοση Curses: %s\n"
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "εκδοση libsigc++: %s\n"
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Χρήση: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [επιλογές] <ενέργεια> ..."
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1691,43 +1834,43 @@
 "λειτουργία):\n"
 "\n"
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Εγκατάσταση/αναβάθμιση πακέτου\n"
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Αφαίρεση πακέτων\n"
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Αφαίρεση πακέτων μαζί με τα αρχεία ρυθμίσεών τους\n"
 
-#: src/main.cc:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Τοποθέτηση πακέτων σε αναμονή\n"
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Ακύρωση της εντολής αναμονή για πακέτο\n"
 
-#: src/main.cc:94
+#: src/main.cc:93
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr "markauto    - Σήμανση των πακέτων σαν να έχουν εγκατασταθεί αυτόματα\n"
 
-#: src/main.cc:95
+#: src/main.cc:94
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 "unmarkauto   - Σήμανση των πακέτων σαν να έχουν εγκατασταθεί χειροκίνητα\n"
 
-#: src/main.cc:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1736,17 +1879,17 @@
 " forbid-version - Απαγόρευση της αναβάθμισης ενός πακέτου σε μια "
 "συγκεκριμένη έκδοση.\n"
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr "update       - Μεταφόρτωση λιστών των νέων/αναβαθμιζόμενων πακέτων\n"
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Εκτέλεση μιας ασφαλούς αναβάθμισης\n"
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1755,60 +1898,60 @@
 " dist-upgrade - Εκτέλεση μιας αναβάθμισης, με πιθανή προσθήκη και αφαίρεση "
 "πακέτων\n"
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr "forget-new   - Ξέχασε ποια πακέτα είναι \"νέα\"\n"
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 " search       - Αναζήτηση ενός πακέτου με βάση το όνομα ή/και έκφραση\n"
 
-#: src/main.cc:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Εμφάνιση λεπτομερειών σχετικά με ένα πακέτο\n"
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Διαγραφή μεταφορτομένων πακέτων\n"
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Διαγραφή παλαιότερα μεταφορτομένων αρχεία πακέτων\n"
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " ημερ. αλλαγών    -Εμφάνισε το ημερολόγιο αλλαγών ενός πακέτου\n"
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Μεταφόρτωση ενός αρχείου .deb για ένα πακέτο\n"
 
-#: src/main.cc:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr "  Επιλογές:\n"
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Αυτό το κείμενο βοήθειας\n"
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Εξομοίωση ενεργειών, αλλά να μην πραγματοποιηθούν στην "
 "πραγματικότητα.\n"
 
-#: src/main.cc:115
+#: src/main.cc:114
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1816,19 +1959,19 @@
 " -d             Μόνο μεταφόρτωση των πακέτων, να μην γίνει εγκατάσταση ή "
 "απεγκατάσταση κάτι.\n"
 
-#: src/main.cc:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr "-P             Να γίνονται πάντα ερωτήσεις επιβεβαίωσης ή ενέργειες\n"
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 "-y            Υπέθεσε ότι η απάντηση σε απλές ερωτήσεις ναι/όχι είναι 'ναι'\n"
 
-#: src/main.cc:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1837,7 +1980,7 @@
 "-F format      Ορισμός του τρόπου εμφάνισης των αποτελεσμάτων αναζήτησης, "
 "δείτε εγχειρίδιο χρήσης\n"
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1845,7 +1988,7 @@
 "-O order       Ορισμός του τρόπου ταξινόμησης των αποτελεσμάτων  αναζήτησης, "
 "δείτε το εγχειρίδιο χρήσης\n"
 
-#: src/main.cc:120
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -1853,32 +1996,32 @@
 " -w width       Καθορισμός του πλάτους εμφάνισης των αποτελεσμάτων "
 "αναζήτησης\n"
 
-#: src/main.cc:121
+#: src/main.cc:120
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr "-f             Επιθετική προσπάθεια επίλυσης των σπασμένων πακέτων.\n"
 
-#: src/main.cc:122
+#: src/main.cc:121
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 "-V             Εμφάνιση των εκδόσεων των πακέτων που πρόκειται να "
 "εγκατασταθούν.\n"
 
-#: src/main.cc:123
+#: src/main.cc:122
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 "-D             Εμφάνιση των εξαρτήσεων των αυτόματα αλλαγμένων πακέτων.\n"
 
-#: src/main.cc:124
+#: src/main.cc:123
 #, c-format
 msgid " -Z\t\t    Show the change in installed size of each package.\n"
 msgstr ""
 "-Z\t\t    Εμφάνιση της αλλαγής μεγέθους στο εγκατεστημένο κάθε πακέτου.\n"
 
-#: src/main.cc:125
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -1886,7 +2029,7 @@
 "-v             Εμφανίζει επιπλέον πληροφορίες (μπορεί να οριστεί πολλαπλές "
 "φορές)\n"
 
-#: src/main.cc:126
+#: src/main.cc:125
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -1894,12 +2037,12 @@
 " -t [release]   Ορίστε την έκδοση από ποια πακέτα θα πρέπει να "
 "εγκατασταθούν\n"
 
-#: src/main.cc:127
+#: src/main.cc:126
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o key=val     Άμεσος καθορισμός μια παραμέτρου με όνομα 'key'\n"
 
-#: src/main.cc:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1908,59 +2051,67 @@
 " --with(out)-recommends\tΚαθορισμός αντιμετώπισης των συνιστώμενων ως\n"
 "                ισχυρών εξαρτήσεων\n"
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, c-format
 msgid " -S fname: Read the aptitude extended status info from fname.\n"
 msgstr " -S fname: Ανάγνωση των εκτεταμένων πληροφοριών από το αρχείο fname.\n"
 
-#: src/main.cc:130
+#: src/main.cc:129
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr "u       : Μεταφόρτωση νέας λίστας πακέτων κατά την εκκίνηση.\n"
 
-#: src/main.cc:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr "-i      : Εκτέλεση μιας εγκατάστασης κατά την εκκίνηση.\n"
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Αυτό το APT έχει Δυνάμεις ΥπερΑγελάδας.\n"
 
-#: src/main.cc:254
+#: src/main.cc:253
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s"
 msgstr "-o απαιτεί μια παράμετρο της μορφής key=value, έλαβε %s"
 
-#: src/main.cc:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "ΠΑΡΑΞΕΝΟ: ελήφθη άγνωστος κώδικας παράμετρου\n"
 
-#: src/main.cc:318
+#: src/main.cc:317
 msgid "Only one of -u and -i may be specified\n"
 msgstr "Μόνο ένα από το -u και i μπορούν να οριστούν\n"
 
-#: src/main.cc:326
+#: src/main.cc:325
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 "το -u και -i δεν μπορεί να οριστούν στη λειτουργία γραμμής εντολών(π.χ. με "
 "το 'install')"
 
-#: src/main.cc:337
+#: src/main.cc:342
 msgid "-u and -i may not be specified with a command"
 msgstr "το -u και -i δεν μπορούν να οριστούν στην ίδια εντολή"
 
-#: src/main.cc:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Αγνωστη εντολή \"%s\"\n"
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Εσφαλμένη επιλογή για τη διαδραστική λειτουργία: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
 #: src/mine/cmine.cc:93
 #, c-format
@@ -1988,7 +2139,7 @@
 msgid "Lost"
 msgstr "Εχασε"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr "Ναρκαλιευτής"
 
@@ -2168,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr "Πακέτο"
 
@@ -2430,13 +2581,14 @@
 "συστήματος."
 
 #: 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 ""
 "Προγράμματα για φαξ μόντεμ και άλλες συσκευές επικοινωνίας\n"
 "Τα πακέτα στο τομέα 'comm' χρησιμοποιούνται για τον έλεγχο μόντεμ και άλλες "
@@ -2898,14 +3050,15 @@
 "τομέα, θα τα βρείτε πλέον στην κυρίως αρχειοθήκη '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"
@@ -2969,11 +3122,12 @@
 " Ειναι διαθέσιμη μια νεότερη έκδοση αυτού του πακέτου."
 
 #: 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 ""
 "Νέα Πακέτα\n"
 " Αυτά τα πακέτα προστέθηκαν στο Debian από την τελευταία φορά που καθαρίσατε "
@@ -3226,101 +3380,121 @@
 msgid "Versions"
 msgstr "Εκδόσεις"
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Ναι ξέρω ότι είναι πολύ κακή ιδέα"
 
 #: src/pkg_item.cc:80
-#, c-format
+#, 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 είναι απαραίτητο πακέτο!\n"
 "\n"
 "Είστε βέβαιοι για την αφαίρεσή του;\n"
 "Πληκτρολογήστε '%s' αν είστε βέβαιοι."
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "Πληροφορίες σχετικά με το %s"
 
-#: src/pkg_item.cc:304
-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 "Διαθέσιμες εκδόσεις του "
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Εκδόσεις"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Εξαρτήσεις του %s"
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 "Πακέτα που εξαρτώνται από το %s"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 "Αναφορά ενός σφάλματος για το %s:\n"
 
-#: src/pkg_item.cc:395
+#: 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 ""
 "Δεν είστε root και δεν μπορώ να βρω τρόπο\n"
 "να γίνετε root. Για να ρυθμίσετε ξανά αυτό το πακέτο\n"
 "εγκαταστήστε το πακέτο μενού, το πακέτο\n"
 "προσπέλασης, ή εκτελέστε το aptitude ως root."
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Ξαναρυθμίζεται το %s\n"
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Επεξεργαστής Ιεραρχίας"
 
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Επεξεργαστής Ιεραρχίας"
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Αναζήτηση του: "
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Όλα Τα Πακέτα"
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Δημιουργία εμφάνισης"
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "Δεν ταίριαξε πακέτο με το \"%s\"."
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "Εισάγετε ένα νέο όριο για το δέντρο των πακέτων:"
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr "Εισάγετε το τρόπο ομαδοποίησης πακέτων για αυτή την απεικόνιση:"
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr "Εισάγετε το τρόπο ταξινόμησης πακέτων για αυτή την απεικόνιση:"
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Πληροφορίες σχετικά με "
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: σφάλμα στα ορίσματα -- two main widgets??"
@@ -3335,7 +3509,7 @@
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: κακό όρισμα!"
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: no main widget found"
 
@@ -3555,6 +3729,75 @@
 "Τα ακόλουθα πακέτα εξαρτώνται από την έκδοση %B%s%b του %B%s%b, και θα "
 "χαλάσουν αν είναι %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 ""
+"Κάποια πακέτα είναι κατεστραμμένα.  Να γίνει προσπάθεια επιδιόρθωσής τους;"
+
+#: 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 "Παρέχει"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Επόμενο"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Κλείσιμο"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
+
+#: 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 "Τα ακόλουθα πακέτα είναι ΕΛΑΤΤΩΜΑΤΙΚΑ:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Μεταφόρτωση πακέτων"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3566,55 +3809,55 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 msgid "Er, there aren't any errors, this shouldn't have happened.."
 msgstr "Χμ, δεν υπήρχαν λάθη, δε θα έπρεπε να συμβαίνει αυτό.."
 
-#: src/ui.cc:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Αναζήτηση του:"
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr "Είστε ήδη ο χρήστης root!"
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
 msgstr ""
 "Η υποδιεργασία τερματίστηκε με σφάλμα -- εισάγατε τον κωδικό σας σωστά;"
 
-#: src/ui.cc:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr "Φόρτωση του cache"
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr "Έξοδος από το Aptitude; Σίγουρα;"
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε τις προσωπικές σας ρυθμίσεις και να "
 "φορτώσετε τις προκαθορισμένες;"
 
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr "Πακέτα"
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 msgid "View available packages and choose actions to perform"
 msgstr "Εμφάνιση των διαθέσιμων πακέτων και επιλογή εργασιών"
 
-#: src/ui.cc:599
+#: src/ui.cc:666
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3631,15 +3874,15 @@
 "επιτρέπεται η διανομή του υπό συγκεκριμένες προϋποθέσεις. Δείτε το\n"
 "'license' για λεπτομέρειες."
 
-#: src/ui.cc:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr "README"
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3647,61 +3890,70 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Συνέχεια"
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Προεπισκόπηση της εγκατάστασης των πακέτων"
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Εμφάνιση και/ή ρύθμιση των ενεργειών που θα εκτελεστούν"
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Προηγ"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "Κάποια πακέτα ήταν κατεστραμμένα και έχουν διορθωθεί"
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Δεν ήταν δυνατή η διόρθωση κάποιων κατεστραμμένων πακέτων!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
 msgstr ""
-"Κάποια πακέτα είναι κατεστραμμένα.  Να γίνει προσπάθεια επιδιόρθωσής τους;"
 
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, 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 ""
 "Η εγκατάσταση/αφαίρεση πακέτων απαιτεί προνόμια διαχειριστή, που δεν\n"
 "έχετε αυτή τη στιγμή.  Θα θέλατε να συνδεθείτε ως χρήστης root;\n"
 
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr "Μετατροπή σε root"
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr "Οχι μετατροπή σε root"
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 msgid "A package-list update or install run is already taking place."
 msgstr "Ήδη βρίσκεται σε εξέλιξη μια διαδικασία αναβάθμισης ή εγκατάστασης."
 
-#: src/ui.cc:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Δεν έχουν επιλεγεί πακέτα για εγκατάσταση, αφαίρεση ή αναβάθμιση."
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3714,166 +3966,181 @@
 "αναβαθμίσετε.\n"
 "Πληκτρολογήστε \"U\" για να προετοιμάσετε μια αναβάθμιση."
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, 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 ""
 "Η ενημέρωση των λιστών πακέτων απαιτεί προνόμια διαχειριστή, που δεν\n"
 "έχετε αυτή τη στιγμή.  Θα θέλατε να συνδεθείτε ως χρήστης root;\n"
 
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr "Σκοτώστε την ώρα σας βρίσκοντας νάρκες"
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Δεν επιτρέπεται εκκαθάριση κατά τη διάρκεια της μεταφόρτωσης"
 
-#: src/ui.cc:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr "Διαγράφονται τα μεταφορτωμένα αρχείων"
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr "Τα μεταφορτωμένα αρχεία έχουν διαγραφεί"
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Τα περιττά μεταφορτωμένα αρχεία έχουν διαγραφεί"
 
-#: src/ui.cc:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Σκοτώστε την ώρα σας βρίσκοντας νάρκες"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr "^Εγκατάσταση/Αφαίρεση πακέτων"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr "Ολοκλήρωση όλων των εκκρεμών εγκαταστάσεων/αφαιρέσεων"
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr "^Ενημέρωση της λίστας πακέτων"
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr "Έλεγχος για νέες εκδόσεις πακέτων"
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr "Ξέχασε τα νέα πακέτα"
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr "Ξέχασε τα πακέτα που είναι \"νέα\""
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr "Εκκαθάριση του cache των πακέτων"
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr "Διαγραφή των αρχείων πακέτου που έχουν μεταφορτωθεί προηγουμένως"
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr "Εκκαθάριση ^περιττών αρχείων"
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Διαγραφή των αρχείων πακέτων που δεν μπορούν πλέον να μεταφορτωθούν"
 
-#: src/ui.cc:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr "Σημείωση ^Αναβαθμιζομένων"
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Σημείωση όλων των αναβαθμιζομένων πακέτων που δεν κρατούνται πλέον για "
 "αναβάθμιση"
 
-#: src/ui.cc:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr "Παίξε Ναρκαλιευτή"
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr "Σύνδεση ως root"
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, 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 ""
 "Εκτελέστε την εντολή 'su' για να συνδεθείτε ως root.  Αυτή θα ξαναεκτελέσει\n"
 "το πρόγραμμα διατηρώντας τις δικές σας ρυθμίσεις"
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr "Επαναφόρτωση του cache πακέτων"
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr "Επαναφόρτωση του cache των πακέτων"
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr "Έξοδος"
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr "Έξοδος από το πρόγραμμα"
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr "Αναίρεση"
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 msgid "Undo the last package operation or group of operations"
 msgstr "Επαναφορά της τελευταίας εργασίας ή ομάδας εργασιών σε πακέτο."
 
-#: src/ui.cc:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr "^Εγκατάσταση"
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Σήμανση του τρέχοντος πακέτου για εγκατάσταση ή αναβάθμιση"
 
-#: src/ui.cc:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr "^Αφαίρεση"
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr "Σήμανση του τρέχοντος πακέτου για αφαίρεση"
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr "^Διαγραφή"
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Σήμανση του τρέχοντος πακέτου και των αρχείων ρυθμίσεών του για αφαίρεση"
 
-#: src/ui.cc:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr "^Κράτηση"
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr "Ακύρωση κάθε ενέργειας για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr "^Αναμονή"
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -3881,251 +4148,255 @@
 "Ακύρωση κάθε ενέργειας για το επιλεγμένο πακέτο, και προστασία του από "
 "μελλοντικές αναβαθμίσεις"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr "^Αυτόματη Σήμανση"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, 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 ""
 "Σήμανση του επιλεγμένου πακέτου ως αυτόματα εγκατεστημένου. \n"
 "έτσι θα αφαιρεθεί αυτόματα όταν δεν θα εξαρτώνται άλλα πακέτα από αυτό."
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr "^Χειροκίνητη Σήμανση"
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, 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 ""
 "Σήμανση των επιλεγμένων πακέτων ως χειροκίνητα εγκατεστημένων. \n"
 "δεν θα αφαιρεθούν εκτός και αν τα αφαιρέσετε εσείς χειροκίνητα."
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr "^Απαγόρευση έκδοσης"
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, 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 ""
 "Απαγόρευσε την υποψήφια έκδοση του επιλεγμένου πακέτου από το να "
 "εγκατασταθεί\n"
 "νεώτερες εκδόσεις του, θα εγκατασταθούν κανονικά"
 
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr "Π^ληροφορίες"
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr "Εμφάνισε περισσότερες πληροφορίες για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr "Α^ρχείο Αλλαγών"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr "Εμφάνισε το ημερολόγιο αλλαγών του Debian για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr "^Ευρεση"
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr "Αναζήτηση για ένα πακέτο"
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr "Βρές ^Ξανά"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr "Επανάληψη της τελευταίας αναζήτησης"
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr "^Περιόρισε Εμφάνιση"
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr "Εφαρμογή φίλτρου στον κατάλογο των πακέτων"
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr "^Εμφάνιση Χωρίς Περιορισμούς"
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr "Αφαίρεση του φίλτρου από τον κατάλογο των πακέτων"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr "Βρές Σ^πασμένο"
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Βρες το επόμενο πακέτο με ανεπίλυτες εξαρτήσεις"
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr "Επιλογές ^Περιβάλλοντος"
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr "Αλλαγή των επιλογών που μεταβάλουν το περιβάλλον εργασίας"
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr "Διαχείριση Εξαρτήσεων"
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Αλλαγή των ρυθμίσεων που επηρεάζουν τη διαχείριση των εξαρτήσεων των πακέτων"
 
-#: src/ui.cc:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr "^Διάφορα"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr "Αλλαγή διαφόρων επιλογών του προγράμματος"
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr "^Επαναφορά επιλογών"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr "Ορισμός όλων των επιλογών στις προκαθορισμένες τιμές"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr "^Επόμενο"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr "Εμφάνιση επόμενης οθόνης"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr "^Προηγ"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr "Εμφάνιση προηγούμενης οθόνης"
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr "^Κλείσιμο"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr "Κλείσιμο αυτής της οθόνης"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr "Νέα Εμφάνιση ^Πακέτου"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr "Δημιουργία νέας οθόνης εμφάνισης πακέτου"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr "Εμφάνιση Νέας Κατηγοριοποίησης"
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr "Εμφάνιση πακέτων ανά κατηγορία"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr "Σχετικά"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr "Εμφάνιση πληροφορίας σχετικά με το πρόγραμμα"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr "^Βοήθεια"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr "Εμφάνιση της βοήθειας του προγράμματος"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr "Οδηγίες ^Χρήσης"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr "Εμφάνιση των αναλυτικών οδηγιών χρήσης"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr "Εμφάνιση των πιο συχνών ερωτήσεων"
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "Αρχείο Αλλαγών"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
 msgstr "Εμφάνιση των σημαντικών αλλαγών σε κάθε έκδοση του προγράμματος"
 
-#: src/ui.cc:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr "Άδεια ^χρήσης"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 msgid "View the terms under which you may copy the program"
 msgstr "Εμφάνιση των όρων χρήσης και διανομής του του προγράμματος"
 
-#: src/ui.cc:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "Επιλογές"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr "Οθόνες"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, 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:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "Ν"
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "Ο"
 
@@ -4137,6 +4408,16 @@
 msgid "Downloading Changelog"
 msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Μεταφόρτωση Αρχείου Αλλαγών"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
@@ -4165,6 +4446,39 @@
 msgid "No"
 msgstr "Οχι"
 
+#~ 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 ""
+#~ "Μερικά πακέτα είναι αδύνατον να εγκατασταθούν. Αυτό μπορεί να σημαίνει "
+#~ "ότι\n"
+#~ "δημιουργήσατε μια απίθανη κατάσταση ή αν χρησιμοποιείτε την ασταθή\n"
+#~ "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
+#~ "μετακινηθεί από τα εισερχόμενα.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Παρακαλώ τοποθετήστε τον ακόλουθο δίσκο στη μονάδα \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Εσφαλμένη επιλογή για τη διαδραστική λειτουργία: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Πληροφορίες σχετικά με "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Δεν ήταν δυνατή η διόρθωση κάποιων κατεστραμμένων πακέτων!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "Αρχείο Αλλαγών"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Deixeu-me tranquil, estic intentant pensar.\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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +156,103 @@
 "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:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Aceptar"
 
 #: 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:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: 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 "Sugiere"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalar"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalar"
+
+#: 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 "actualizar"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "actualizar"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "desactualizado"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "desactualizado"
+
+#: 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 "^Siguiente"
+
+#: 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 ""
@@ -239,24 +326,24 @@
 msgstr ""
 "El paquete %s no es actualizable, no se puede prohibir una actualización\n"
 
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
 #, 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:240
+#: src/cmdline/cmdline_action.cc:225
 #, 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:246
+#: src/cmdline/cmdline_action.cc:231
 #, 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:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -265,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:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -274,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:307
+#: src/cmdline/cmdline_action.cc:292
 #, 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:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -290,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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -337,13 +424,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "Se liberará %sB de espacio de disco"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operación %s inválida"
 
-#: 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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "Cancela.\n"
@@ -353,7 +440,7 @@
 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:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "No se pudo leer la lista de fuentes"
 
@@ -422,95 +509,95 @@
 "¿Qué es? Es un elefante que está siendo devorado por una serpiente, por "
 "supuesto.\n"
 
-#: src/cmdline/cmdline_prompt.cc:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "No se pudo leer la lista de fuentes"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 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:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "pero está instalado %s."
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 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:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 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:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " o"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Los siguientes paquetes están ROTOS:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 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:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "Los siguientes paquetes han sido retenidos automáticamente:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Se instalarán automáticamente los siguientes paquetes NUEVOS:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Se ELIMINARÁN automáticamente los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr "Se han retenido los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "Se REINSTALARÁN los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "Se instalarán los siguiente paquetes NUEVOS:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "Se ELIMINARÁN los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "Se actualizarán los siguientes paquetes:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, 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:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, 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:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -519,88 +606,87 @@
 "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:328
+#: src/cmdline/cmdline_prompt.cc:332
 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:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Para continuar, teclee la frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, 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:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, 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:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, 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:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquetes actualizados, %lu nuevos instalados, "
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, 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:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Necesito descargar %sB/%sB de ficheros. "
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Necesito descargar %sB de ficheros. "
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, 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:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, 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:521
+#: 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:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "Presione Enter para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
@@ -608,12 +694,16 @@
 "línea\n"
 "después de 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Presione Enter para continuar."
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "¿Quiere continuar? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -624,7 +714,7 @@
 "Se mostrará la información de dependencias.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -635,7 +725,7 @@
 "No se mostrará la información de dependencias.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -646,7 +736,7 @@
 "Se mostrarán las versiones.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -657,7 +747,7 @@
 "No se mostrarán la versiones.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -668,7 +758,7 @@
 "Se mostrarán los tamaños de los cambios.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -679,7 +769,7 @@
 "No Se mostrarán los tamaños de los cambios.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -730,35 +820,89 @@
 "  _ : Purga\n"
 "  = : Retiene\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, 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
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Salir del programa"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Los siguientes paquetes están ROTOS:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, 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"
 
-#: 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 ""
-"No se cumplen las dependencias de algunos paquetes. Esto puede significar "
-"que ha\n"
-"solicitado una situación imposible o que si usa la distribución inestable "
-"algún\n"
-"paquete requerido aún no ha sido creado o sigue en «Incoming».\n"
-"\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 "No se satisfacen las dependencias de los siguientes paquetes:\n"
@@ -956,12 +1100,12 @@
 msgid "Description: "
 msgstr "Descripción: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Descargará/instalará/eliminará paquetes.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Error interno, la ordenación no terminó"
 
@@ -1005,28 +1149,24 @@
 msgid "UNAVAILABLE"
 msgstr "NO DISPONIBLE"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 ""
-"Por favor, introduzca en la unidad «%s» el siguiente disco:\n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Por favor, introduzca el disco etiquetado «%s» en la unidad «%s»"
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Obj "
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Descargando "
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Listo "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "Descargando..."
 
@@ -1034,7 +1174,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "No se pudo leer la lista de paquetes fuente"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "No se pudo bloquear el directorio de listas...¿es el administrador?"
 
@@ -1046,29 +1186,33 @@
 msgid "View the progress of the package list update"
 msgstr "Ver el progreso de la actualización de la lista de paquetes"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "No se pudo borrar los directorios de lista"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "Borrando los ficheros descargados ya obsoletos"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Borrando los ficheros descargados ya obsoletos\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "Imposible abrir %s para registrar las acciones"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "informe de registro"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1079,77 +1223,77 @@
 "realizar. Puede que no se completen algunas acciones por fallos de dpkg.\n"
 "\n"
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "Se instalarán %li paquetes y se eliminarán %li.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "Se usará %sB de espacio en disco\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "Se liberarán %sB bytes de espacio en disco\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[ACTUALIZA] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[DESACTUALIZA] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "ELIMINA"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "INSTALA"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "REINSTALA"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "RETIENE"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "ROTO"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "ELIMINA, NO USADO"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "ELIMINA, DEPENDENCIAS"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "INSTALA, DEPENDENCIAS"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "RETIENE, DEPENDENCIAS"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1160,34 +1304,39 @@
 "\n"
 "Registro completado.\n"
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "Descargando paquetes"
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Ver el progreso de la descarga de los paquetes"
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paquete: "
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Error interno: no se pudo generar la lista de paquetes a descargar"
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr "Incapaz de corregir los paquetes no disponibles"
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 "¡Argghh! Algo malo pasó mientras se instalaban los paquetes. Intentado "
 "recuperar:"
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "Presione ENTER para continuar.\n"
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1251,11 +1400,6 @@
 msgid "[ERROR]"
 msgstr "[ERROR]"
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Por favor, introduzca el disco etiquetado «%s» en la unidad «%s»"
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1296,118 +1440,118 @@
 "«%s»\n"
 "y presione enter\n"
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "No se puede abrir el fichero de estado extendido de Aptitude"
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Leyendo la información de estado extendido"
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Inicializando el estado de los paquetes"
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "No se puede abrir el fichero de estado de Aptitude"
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "Escribiendo información de estado extendido"
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 "Desbordamiento de búfer interno en el paquete \"%s\" al escribir el fichero "
 "de estado"
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "No se pudo escribir el fichero de estado"
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "Error al escribir el fichero de estado"
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "No se pudo reemplazar el fichero de estado anterior"
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 "No ha sido posible corregir las dependencias, no se pueden instalar algunos "
 "de los paquetes"
 
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr "No se pudo leer la lista de fuentes."
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 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:1335
+#: src/generic/aptcache.cc:1556
 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:141
+#: 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:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "Imposible reemplazar %s con el nuevo fichero de configuración"
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 "Aviso: no se pudo bloquear el fichero de caché. Abriendo en modo de sólo "
 "lectura."
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "'(' no cerrado"
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Tipo de dependencia desconocida: %s"
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Tipo de acción desconocida: %s"
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Prioridad %s desconocida"
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Tipo de patrón desconocido: %c"
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "Expresión vacía no esperada"
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "Expresión malformada"
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "')' inesperado"
 
@@ -1433,7 +1577,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "No se puede obtener el valor de $HOME, usando TMPDIR (inseguro)"
 
-#: 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 "Registro de cambios de %s"
@@ -1646,17 +1790,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo de norma de ordenación inválida: '%s'"
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilado en %s %s\n"
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
@@ -1665,7 +1809,7 @@
 "\n"
 "Versión de ncurses: %s\n"
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1674,22 +1818,22 @@
 "\n"
 "Versión de curses: %s\n"
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "Versión de libsigc++: %s\n"
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Modo de uso: aptitude [-S nombre_fichero] [-u|-i]"
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opciones] <acción> ..."
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1699,43 +1843,43 @@
 "interactivo):\n"
 "\n"
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      -  instala/actualiza paquetes\n"
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       -  elimina paquetes\n"
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, 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:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - bloquea paquetes\n"
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - desbloquea un paquete\n"
 
-#: src/main.cc:94
+#: src/main.cc:93
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr " markauto     - marca paquetes como instalados manualmente\n"
 
-#: src/main.cc:95
+#: src/main.cc:94
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - desmarca paquetes como instalados manualmente\n"
 
-#: src/main.cc:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1744,17 +1888,17 @@
 " forbid-version - prohíbe a aptitude actualizar a una versión específica de "
 "un paquete.\n"
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - descarga las listas de paquetes nuevos/actualizables\n"
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - realiza una actualización segura\n"
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1763,71 +1907,71 @@
 " dist-upgrade - realiza una actualización, posiblemente instalando y "
 "eliminando paquetes\n"
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - olvida qué paquetes son \"nuevos\"\n"
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, 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:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - muestra información detallada de un paquete\n"
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - elimina los ficheros de paquetes descargados\n"
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 " autoclean    - elimina los ficheros de paquetes descargados obsoletos\n"
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - muestra el registro de cambios del paquete\n"
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, 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:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opciones:\n"
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr "-h              Este texto de ayuda\n"
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, 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:115
+#: src/main.cc:114
 #, 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:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr "-p              Siempre pide confirmación de las acciones\n"
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1835,7 +1979,7 @@
 "-y              Supone que la respuesta a preguntas simples del tipo sí/no "
 "es «sí»\n"
 
-#: src/main.cc:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1844,7 +1988,7 @@
 "-F formato      Especifica el formato para mostrar los resultados de las "
 "búsquedas, lea el manual\n"
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1852,7 +1996,7 @@
 "-O orden        Especifica como se deben ordenar los resultados de la "
 "búsqueda, lea el manual\n"
 
-#: src/main.cc:120
+#: src/main.cc:119
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
@@ -1860,17 +2004,17 @@
 "-w ancho        Especifica el ancho del visor para dar formato a los "
 "resultado de la búsqueda\n"
 
-#: src/main.cc:121
+#: src/main.cc:120
 #, 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:122
+#: src/main.cc:121
 #, 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:123
+#: src/main.cc:122
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -1878,19 +2022,19 @@
 "-D              Muestra las dependencias de los paquetes cambiados "
 "automáticamente.\n"
 
-#: src/main.cc:124
+#: src/main.cc:123
 #, 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:125
+#: src/main.cc:124
 #, 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:126
+#: src/main.cc:125
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
@@ -1898,14 +2042,14 @@
 "-t [distrib]    Establece la distribución desde la que se instalan los "
 "paquetes\n"
 
-#: src/main.cc:127
+#: src/main.cc:126
 #, 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:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1914,60 +2058,68 @@
 " --with(out)-recommends,\tEspecifica si se tratan o no las                "
 "recomendaciones como dependencias fuertes\n"
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, 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:130
+#: src/main.cc:129
 #, 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:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr "-i       : Realiza una instalación al arrancar.\n"
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, 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:254
+#: src/main.cc:253
 #, 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:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "RAREZA: recibido código de opción desconocido\n"
 
-#: src/main.cc:318
+#: src/main.cc:317
 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:326
+#: src/main.cc:325
 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:337
+#: src/main.cc:342
 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:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Orden desconocida \"%s\"\n"
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Opción inválida para el modo interactivo: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
 #: src/mine/cmine.cc:93
 #, c-format
@@ -1995,7 +2147,7 @@
 msgid "Lost"
 msgstr "Perdió"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr "Buscaminas"
 
@@ -2175,7 +2327,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr "Paquete"
 
@@ -2436,13 +2588,14 @@
 "sistema"
 
 #: 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 ""
 "Programas para faxmodems y otros dispositivos de comunicación\n"
 " Los paquetes en la sección 'comm' se usan para controlar modems y otros\n"
@@ -2905,14 +3058,15 @@
 "la sección '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"
@@ -2976,11 +3130,12 @@
 " Está disponible una nueva versión de estos paquetes"
 
 #: 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 ""
 "Paquetes nuevos\n"
 " Estos paquetes se han añadido a Debian desde la última vez que borró la "
@@ -3237,103 +3392,123 @@
 msgid "Versions"
 msgstr "Versiones"
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Sí, sé que es una idea muy mala"
 
 #: src/pkg_item.cc:80
-#, c-format
+#, 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 es un paquete esencial!<\n"
 "\n"
 "¿Seguro que quiere eliminarlo?\n"
 "Si lo está escriba '%s'."
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "Información sobre %s"
 
-#: src/pkg_item.cc:304
-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 "Versiones disponibles de "
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Versiones"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "Dependencias de %s"
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 "Paquetes que dependen de %s"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 "Informando de un fallo en %s:\n"
 
-#: src/pkg_item.cc:395
+#: 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 ""
 "Usted no es el administrador y no encuentro ningún\n"
 "modo de que convierta en él. Para reconfigurar \n"
 "este paquete, instale el paquete 'menu', el paquete\n"
 "'login', o ejecute aptitude como administrador."
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "Reconfigurando %s\n"
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Editor de jerarquías"
 
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Editor de jerarquías"
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Buscar por:"
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Todos los paquetes"
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Construyendo la vista"
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "Ningún paquete concuerda con el patrón \"%s\"."
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "Introduzca el nuevo límite de árbol de paquetes:"
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr ""
 "Introduzca el nuevo mecanismo de agrupación de paquetes para esta vista:"
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 "Introduzca el nuevo mecanismo de ordenación de paquetes para esta vista: "
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Información sobre "
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
@@ -3350,7 +3525,7 @@
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: ¡argumento incorrecto!"
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: componente principal no encontrado"
 
@@ -3569,6 +3744,74 @@
 "Los siguientes paquetes dependen de la versión %B%s%b de %B%s%b, y se "
 "romperán si es %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 "Algunos paquetes están rotos. ¿Los intento arreglar?"
+
+#: 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 "Proporciona"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "^Siguiente"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "^Cierra"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Los siguientes paquetes están ROTOS:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Los siguientes paquetes están ROTOS:"
+
+#: 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 "Los siguientes paquetes están ROTOS:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Descargando e instalando paquetes"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3580,54 +3823,54 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 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:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Buscar por:"
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr "¡Ya es el administrador!"
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 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:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr "Cargando caché"
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr "¿Salir de Aptitude?"
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 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:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr "Paquetes"
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 msgid "View available packages and choose actions to perform"
 msgstr "Ver los paquetes disponibles y escoger las acciones a realizar"
 
-#: src/ui.cc:599
+#: src/ui.cc:666
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3644,15 +3887,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:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr "LÉAME"
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3660,64 +3903,74 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Continua"
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Pre-visualización de la instalación de los paquetes"
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ver y/o ajustar las acciones que se realizarán"
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "^Prev"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "Algunos paquetes estaban rotos y se han arreglado."
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "¡No se pudieron arreglar algunos paquetes rotos!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "Algunos paquetes están rotos. ¿Los intento arreglar?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, 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 ""
 "La instalación/eliminación de paquetes requiere privilegios de \n"
 "administración, que actualmente no tiene. ¿Desearía cambiar a la \n"
 "cuenta de administrador?\n"
 
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr "Convertirse en administrador"
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr "No convertirse en administrador"
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 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:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "No hay ningún paquete planificado para instalar, eliminar o actualizar."
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3729,169 +3982,184 @@
 "Algunos paquetes pueden actualizarse, pero ha elegido no actualizarlos.\n"
 "Escriba \"U\" para preparar una actualización."
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, 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 ""
 "La actualización de la lista de paquetes disponibles requiere privilegios "
 "de\n"
 "administración, que actualmente no tiene. ¿Desearía cambiar a la cuenta\n"
 "de administrador?\n"
 
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr "Pierda su tiempo intentando buscar las minas"
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 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:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr "Eliminando ficheros descargados"
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr "Se han borrado los ficheros de paquetes descargados"
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, 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:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Pierda su tiempo intentando buscar las minas"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr "^Instalar/eliminar paquetes"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr "Realizar todas las instalaciones y eliminaciones pendientes"
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr "^Actualizar la lista de paquetes"
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr "Buscar nuevas versiones de los paquetes"
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr "^Olvidar paquetes nuevos"
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr "Olvidar que paquetes son «nuevos»"
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr "^Limpiar la caché de paquetes"
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr "Borra los ficheros de paquetes descargados previamente"
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr "Limpiar ficheros ^obsoletos"
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 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:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr "Marcar ^actualizable"
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 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:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr "^Jugar al buscaminas"
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr "^Convertirse en administrador"
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, 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 ""
 "Ejecuta 'su' para convertirse en administrador. Esto reiniciará el programa\n"
 "pero se mantendrán sus preferencias."
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr "^Recargar la caché de paquetes"
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr "Recarga la caché de paquetes"
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr "^Salir"
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr "Deshacer"
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 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:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marcar el paquete seleccionado actualmente para instalar o actualizar"
 
-#: src/ui.cc:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr "^Eliminar"
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar el paquete seleccionado actualmente para eliminar"
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 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:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr "^Mantener"
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar cualquier acción en el paquete seleccionado"
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr "^Retener"
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -3899,253 +4167,257 @@
 "Cancelar cualquier acción en el paquete seleccionado, y protejerlo de "
 "futuras actualizaciones"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr "Marcar ^automático"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, 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 ""
 "Marcar el paquete seleccionado como instalado automáticamente.\n"
 "Se eliminará automáticamente si ningún otro paquete depende de él"
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr "Marcar ^manual"
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, 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 ""
 "Marcar el paquete seleccionado como instalado manualmente.\n"
 "No se eliminará a menos que lo haga manualmente"
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr "^Prohíbir versiones"
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, 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 ""
 "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:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr "^Información"
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr "Mostrar más información acerca del paquete seleccionado"
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr "^Registro de cambios"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar el registro de cambios del paquete seleccionado"
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr "^Buscar"
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr "Buscar un paquete"
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr "Buscar otra ^Vez"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr "Repetir la última búsqueda"
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr "^Limitar vista"
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr "Aplicar un filtro a la lista de paquetes"
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr "^No limitar vista"
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr "Eliminar el filtro de la lista de paquetes"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr "Buscar ^Roto"
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontrar el siguiente paquete con dependencias insatisfechas"
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr "Opciones de la ^IU"
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr "Cambiar las preferencias que afectan a la interfaz de usuario"
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr "Manejo de ^dependencias"
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 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:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr "^Miscelánea"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr "Cambiar diversas preferencias del programa"
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr "^Deshacer opciones"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr "Fijar todas las preferencias en los valores predeterminados"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr "^Siguiente"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr "Ver siguiente pantalla"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr "^Prev"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr "Ver pantalla anterior"
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr "^Cierra"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr "Cerrar esta pantalla"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr "Nueva ^vista de paquetes"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr "Crear una nueva vista de paquetes por defecto"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr "Nuevo ^navegador de categorías"
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr "Navegar paquetes por categorías"
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr "^Acerca de"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr "Ver información sobre este programa"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr "^Ayuda"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr "Ver la ayuda en línea"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr "^Manual de usuario"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr "Consultar el manual detallado del programa"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr "^PUF"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr "Ver una lista de preguntas frecuentes"
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "^Registro de cambios"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, 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:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 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:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr "Buscar"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "Opciones"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, 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:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "sí"
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "no"
 
@@ -4157,6 +4429,16 @@
 msgid "Downloading Changelog"
 msgstr "Descargando registro de cambios"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Descargando registro de cambios"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
@@ -4185,6 +4467,39 @@
 msgid "No"
 msgstr "No"
 
+#~ 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 ""
+#~ "No se cumplen las dependencias de algunos paquetes. Esto puede significar "
+#~ "que ha\n"
+#~ "solicitado una situación imposible o que si usa la distribución inestable "
+#~ "algún\n"
+#~ "paquete requerido aún no ha sido creado o sigue en «Incoming».\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Por favor, introduzca en la unidad «%s» el siguiente disco:\n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Opción inválida para el modo interactivo: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Información sobre "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "¡No se pudieron arreglar algunos paquetes rotos!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "^Registro de cambios"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Váyase, estoy intentando pensar.\n"
 
@@ -4279,9 +4594,6 @@
 #~ msgid "\" into the drive \""
 #~ msgstr "\" en la unidad \""
 
-#~ msgid "Downloading and installing packages"
-#~ msgstr "Descargando e instalando paquetes"
-
 #~ msgid "Unrecoverable missing packages.  Press any key to continue..."
 #~ msgstr "Paquetes irrecuperables. Presione una tecla para continuar..."
 

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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +157,103 @@
 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:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
+#: src/vscreen/vs_util.cc:328
 msgid "Ok"
 msgstr "Ados"
 
 #: 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:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Utzi"
 
+#: 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 "Iradokiak"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "instalaturik"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "instalaturik"
+
+#: 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 "eguneratu"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "eguneratu"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "atzeraturik"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "atzeraturik"
+
+#: 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 "Hurre^ngoa"
+
+#: 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 ""
@@ -239,22 +326,22 @@
 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:213
+#: src/cmdline/cmdline_action.cc:198
 #, 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:240
+#: src/cmdline/cmdline_action.cc:225
 #, 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:246
+#: src/cmdline/cmdline_action.cc:231
 #, 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:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -263,7 +350,7 @@
 "Ezin da \"%s\" paketa aurkitu, eta 40 paketetik\n"
 "gora dute \"%s\" beren izenean.\n"
 
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -272,13 +359,13 @@
 "Ezin da \"%s\" paketa aurkitu, eta hurrengo paketeak\n"
 "\"%s\" beren izenean dute:\n"
 
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:292
 #, 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:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -287,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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -331,13 +418,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "%sB disko leku hustuko dira"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operazio baliogabea %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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "Eten.\n"
@@ -347,7 +434,7 @@
 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:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "Ezin da jatorri zerrenda irakurri"
 
@@ -416,95 +503,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:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "Ezin da jatorri zerrenda irakurri"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 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:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "baina %s instalaturik dago"
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 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:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 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:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr "edo"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Hurrengo paketeak APURTURIK daude:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 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:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "Hurrengo paketeak automatikoki eguneratu gabe utziko dira:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Hurrengo pakete berri hauek automatikoki instalatu egingo dira:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Hurrengo pakete berri hauek automatikoki EZABATU egingo dira:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Hurrengo paketak ATZERATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr "Honako paketea hauek ez dira eguneratuko:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "Hurrengo paketak BERRINSTALATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "Hurrengo paketak berriak INSTALATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "Hurrengo paketak EZABATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "Hurrengo paketak EGUNERATUAK izango dira:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Hurrego BEHARREZKO paketeak EZABATU egingo dira!\n"
 
-#: src/cmdline/cmdline_prompt.cc:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, 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:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -513,97 +600,100 @@
 "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:328
+#: src/cmdline/cmdline_prompt.cc:332
 msgid "I am aware that this is a very bad idea"
 msgstr "Hau oso ideia txarra ela ziur nago"
 
-#: src/cmdline/cmdline_prompt.cc:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Jarraitzeko idatzi \"%s\" esaldia:\n"
 
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, 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:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, 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:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, 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:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakete eguneratorik, %lu berri instalaturik"
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu berrinstalaturik, "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu atzeraturik, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, 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:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "%sB/%sB Fitxategi eskuratu behar dira. "
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "%sB Fitxategi eskuratu behar dira. "
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Desenpaketatu ondoren %sB erabiliko dira\n"
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Desenpaketatu ondoren %sB uztuko dira\n"
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: 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:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "Zanpatu return jarraitzeko."
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, 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:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Zanpatu return jarraitzeko."
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Jarraitzea nahi al duzu? [Y/n/?]"
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -614,7 +704,7 @@
 "Dependentzi argibideak erakutsiko dira.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -625,7 +715,7 @@
 "Dependentzi argibideak ez da erakutsiko.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -636,7 +726,7 @@
 "Bertsioak erakutsiko dira.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -647,7 +737,7 @@
 "Bertsioak ez dira erakutsiko.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -658,7 +748,7 @@
 "Tamaina aldaketeak erakutsiko dira.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -669,7 +759,7 @@
 "Tamaina aldaketeak ez dira erakutsiko.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -720,34 +810,89 @@
 "  _ : Garbitu\n"
 "  = : Hizoztu\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, 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
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Programatik irten"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Hurrengo paketeak APURTURIK daude:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "bilatu: Zuk beintzat bilaketa patroi bat eman behar duzu\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 ""
-"Pakete batenbatek betegabeko dependentziak ditu. Hauk zuk ezinezko den\n"
-"egoera bat eskatu duzlako edo zuk distrbuzio ezegonkorra darabilkizu eta\n"
-"dependentzia pakete batenbat ez da sortu orindik edo sarreratik kanpo\n"
-"utzi da.\n"
-"\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 "Honako paketeek betegabeko dependentziak dituzte:\n"
@@ -945,12 +1090,12 @@
 msgid "Description: "
 msgstr "Azalpena: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Paketea dekargatu/instalatu/ezabatu-ko ditu.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Barne Errorea, Sailkatzea ez da maitu"
 
@@ -993,28 +1138,24 @@
 msgid "UNAVAILABLE"
 msgstr "ESKURAEZINA"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 ""
-"Mesedez sar hurrengo diska \"%s\" irakulean : \n"
-"%s"
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Mesedez sartu \"%s\" izeneko diska \"%s\" irakurlean"
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Jo "
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Deskargatzen "
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Hartu "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "Dekargatzen..."
 
@@ -1022,7 +1163,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "Ezin da jatorri pakete zerrenda irakurri"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "Ezin da direktorioa blokeatu. Root al zara ?"
 
@@ -1034,29 +1175,33 @@
 msgid "View the progress of the package list update"
 msgstr "Pakete zerrenda eguneraketen egoera bistarazi"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "Ezin izan dira zerrendako karpetak ezabatu"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "Deskargatutako fitxategi zaharkituak ezabatzen"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Deskargatutako fitxategi zaharkituak ezabatzen\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "Ezin da %s ireki ekintzak erregistratzeko"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "Erregistro erreportea"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1067,77 +1212,77 @@
 "ditu. Posible da ekintza batzuek dpkg arazorengatik ez osatzea.\n"
 "\n"
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "%li pakete instalatu; eta %li pakete ezabatuko dira.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "%sB diska leku erabiliko da\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "%sB bite diska leku hustuko dira\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[EGUNERATU] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[ATZERATU] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "EZABATU"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "INSTALATU"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "BERRINSTALATU"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "HIZOZTU"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "APURTURIK"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "EZABATU, ERABILI GABE"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "EZABATU, DEPENDENTZIAK"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "INSTALATU, DEPENDENTZIAK"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "HIZOZTU, DEPENDENTZIAK"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: src/download.cc:291
+#: src/download.cc:292
 #, c-format
 msgid "[%s] %s\n"
 msgstr "[%s] %s\n"
 
-#: src/download.cc:294
+#: src/download.cc:295
 #, c-format
 msgid ""
 "===============================================================================\n"
@@ -1148,34 +1293,39 @@
 "\n"
 "Erregistro osoa.\n"
 
-#: src/download.cc:329
+#: src/download.cc:330
 msgid "Downloading packages"
 msgstr "Paketeak deskargatzen"
 
-#: src/download.cc:330
+#: src/download.cc:331
 msgid "View the progress of the package download"
 msgstr "Pakete deskargaren aurrerapena ikusi"
 
-#: src/download.cc:352
+#: src/download.cc:332
+#, fuzzy
+msgid "Package Download"
+msgstr "Paketea:"
+
+#: src/download.cc:354
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Barne errorea: Ezin da deskargatzeko pakete zerrenda sortu"
 
-#: src/download.cc:413
+#: src/download.cc:415
 msgid "Unable to correct for unavailable packages"
 msgstr "Ez da gai eskuragarri ez dauden paketeak konpontzeko gai"
 
-#: src/download.cc:465
+#: src/download.cc:467
 msgid ""
 "Ack!  Something bad happened while installing packages.  Trying to recover:"
 msgstr ""
 "Axk  Paketeak instalatzeroak okerreko zerbait gertatu da. Berreskuratzen "
 "saiatzen:"
 
-#: src/download.cc:475 src/pkg_item.cc:413
+#: src/download.cc:477 src/pkg_item.cc:432
 msgid "Press return to continue.\n"
 msgstr "Zanpatu return jarraitzeko.\n"
 
-#: src/download.cc:506
+#: src/download.cc:508
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -1237,11 +1387,6 @@
 msgid "[ERROR]"
 msgstr "[ERROREA]"
 
-#: src/download_screen.cc:57
-#, c-format
-msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
-msgstr "Mesedez sartu \"%s\" izeneko diska \"%s\" irakurlean"
-
 #: src/download_screen.cc:181
 #, c-format
 msgid "Downloaded %sB in %ss (%sB/s)."
@@ -1281,114 +1426,114 @@
 "Medio Aldaketa: Mesedez sar ezazu '%s' izeneko diska '%s' gailuan eta enter "
 "sakatu\n"
 
-#: src/generic/aptcache.cc:245
+#: src/generic/aptcache.cc:253
 msgid "Can't open Aptitude extended state file"
 msgstr "Ezin da Aptitude hedatutako fitxategia ireki"
 
-#: src/generic/aptcache.cc:252 src/generic/aptcache.cc:305
-#: src/generic/aptcache.cc:307
+#: src/generic/aptcache.cc:260 src/generic/aptcache.cc:313
+#: src/generic/aptcache.cc:315
 msgid "Reading extended state information"
 msgstr "Hesatutako egoera argibideak irakurtzen"
 
-#: src/generic/aptcache.cc:313 src/generic/aptcache.cc:387
-#: src/generic/aptcache.cc:390
+#: src/generic/aptcache.cc:321 src/generic/aptcache.cc:395
+#: src/generic/aptcache.cc:398
 msgid "Initializing package states"
 msgstr "Pakete egoerak hasieratzen"
 
-#: src/generic/aptcache.cc:501
+#: src/generic/aptcache.cc:509
 msgid "Cannot open Aptitude state file"
 msgstr "Ezin da Aptitude egoera fitxategia ireki"
 
-#: src/generic/aptcache.cc:505 src/generic/aptcache.cc:560
-#: src/generic/aptcache.cc:563
+#: src/generic/aptcache.cc:513 src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:571
 msgid "Writing extended state information"
 msgstr "egoera argibide hedatuak idazten"
 
-#: src/generic/aptcache.cc:542
+#: src/generic/aptcache.cc:550
 #, c-format
 msgid "Internal buffer overflow on package \"%s\" while writing state file"
 msgstr ""
 "\"%s\" paketea instalatzerakoan barne bufer gainez egoera fitxategia "
 "idazterakoan"
 
-#: src/generic/aptcache.cc:551
+#: src/generic/aptcache.cc:559
 msgid "Couldn't write state file"
 msgstr "Ezin da egoera fitxategia idatzi"
 
-#: src/generic/aptcache.cc:568
+#: src/generic/aptcache.cc:576
 msgid "Error writing state file"
 msgstr "Errorea egoera fitxategia idazterakoan"
 
-#: src/generic/aptcache.cc:584
+#: src/generic/aptcache.cc:592
 msgid "couldn't replace old state file"
 msgstr "Ezin da egoera fitxategi zaharra aldatu"
 
-#: src/generic/aptcache.cc:960
+#: src/generic/aptcache.cc:1000
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr "Ezin dira dependentziak konpondu, zenbait pakete ezin dira instalatu"
 
-#: src/generic/aptcache.cc:1325
+#: src/generic/aptcache.cc:1546
 msgid "The list of sources could not be read."
 msgstr "Ezin da jatorri zerrenda irakurri."
 
-#: src/generic/aptcache.cc:1332
+#: src/generic/aptcache.cc:1553
 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:1335
+#: src/generic/aptcache.cc:1556
 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:141
+#: src/generic/apt.cc:142
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Ezzinb da %s idazteko ireki"
 
-#: src/generic/apt.cc:151
+#: src/generic/apt.cc:152
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr "Ezin da %s konfigurazio fitxategi berriagatik aldatu"
 
-#: src/generic/apt.cc:226
+#: src/generic/apt.cc:227
 msgid "Warning: could not lock the cache file.  Opening in read-only mode"
 msgstr ""
 "Oharra; ezin da katxe fitxategia blokeatu.  Irakurketa moduan irekitzen"
 
-#: src/generic/matchers.cc:780
+#: src/generic/matchers.cc:797
 msgid "Unmatched '('"
 msgstr "Aurkitu ez den '('"
 
-#: src/generic/matchers.cc:870 src/generic/matchers.cc:949
+#: src/generic/matchers.cc:887 src/generic/matchers.cc:968
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "Dependentzi mota ezezaguna: %s"
 
-#: src/generic/matchers.cc:931
+#: src/generic/matchers.cc:950
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "Akzio mota ezezaguna: %s"
 
-#: src/generic/matchers.cc:998
+#: src/generic/matchers.cc:1017
 #, c-format
 msgid "Unknown priority %s"
 msgstr "Lehentasun ezezaguna: %s"
 
-#: src/generic/matchers.cc:1020
+#: src/generic/matchers.cc:1039
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "Patroi mota ezezaguna: %c"
 
-#: src/generic/matchers.cc:1065
+#: src/generic/matchers.cc:1084
 msgid "Unexpected empty expression"
 msgstr "Espero ez zen espresio hutsa."
 
-#: src/generic/matchers.cc:1100
+#: src/generic/matchers.cc:1119
 msgid "Badly formed expression"
 msgstr "Gaizki eraturako espresioa"
 
-#: src/generic/matchers.cc:1129
+#: src/generic/matchers.cc:1148
 msgid "Unexpected ')'"
 msgstr "Ez zen itxoiten ')'"
 
@@ -1413,7 +1558,7 @@
 msgid "Can't get value of $HOME, using TMPDIR (insecure)"
 msgstr "Ezinda $HOME balioa lortu; TMPDIR erabiltzen (ez ziurra)"
 
-#: 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 "%s-n erregistro aldaketak"
@@ -1623,17 +1768,17 @@
 msgid "Invalid sorting policy type '%s'"
 msgstr "Baliogabea biltze politika mota:'%s'"
 
-#: src/main.cc:68
+#: src/main.cc:67
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s, %s %s-en konpilaturik\n"
 
-#: src/main.cc:71
+#: src/main.cc:70
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilatzailea: g++ %s\n"
 
-#: src/main.cc:74
+#: src/main.cc:73
 #, c-format
 msgid ""
 "\n"
@@ -1642,7 +1787,7 @@
 "\n"
 "NCurses bertsioa: %s\n"
 
-#: src/main.cc:76
+#: src/main.cc:75
 #, c-format
 msgid ""
 "\n"
@@ -1651,22 +1796,22 @@
 "\n"
 "Curses bertsioa: %s\n"
 
-#: src/main.cc:78
+#: src/main.cc:77
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr "libsigc++ bertsioa: %s\n"
 
-#: src/main.cc:84
+#: src/main.cc:83
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Erabilera: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:86
+#: src/main.cc:85
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [aukerak] <ekintza> ..."
 
-#: src/main.cc:88
+#: src/main.cc:87
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -1676,43 +1821,43 @@
 "da);\n"
 "\n"
 
-#: src/main.cc:89
+#: src/main.cc:88
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr " install      - Paketeak instalatu/eguneratu\n"
 
-#: src/main.cc:90
+#: src/main.cc:89
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr " remove       - Paketeak ezabatu\n"
 
-#: src/main.cc:91
+#: src/main.cc:90
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr " purge        - Paketeak eta haien konfigurazio fitxategiak ezabatu\n"
 
-#: src/main.cc:92
+#: src/main.cc:91
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr " hold         - Paketeak hizoztu\n"
 
-#: src/main.cc:93
+#: src/main.cc:92
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr " unhold       - Ezeztatu pakete baten hizoztu komandoa\n"
 
-#: src/main.cc:94
+#: src/main.cc:93
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 " markauto     - Markatu automatikoki instlatuak izan diren fitxategiak\n"
 
-#: src/main.cc:95
+#: src/main.cc:94
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr " unmarkauto   - Markatu eskus instalaturik izan diren paketeak\n"
 
-#: src/main.cc:100
+#: src/main.cc:99
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -1721,17 +1866,17 @@
 " forbid-version - aptitude pakete baten bertsio jakin batera eguneratzea "
 "galerazten du.\n"
 
-#: src/main.cc:101
+#: src/main.cc:100
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr " update       - Pakete berri/eguneragarrien zerrenda deskargatu\n"
 
-#: src/main.cc:102
+#: src/main.cc:101
 #, c-format
 msgid " upgrade      - Perform a safe upgrade\n"
 msgstr " upgrade      - Eguneraketa ziur bat egin\n"
 
-#: src/main.cc:103
+#: src/main.cc:102
 #, c-format
 msgid ""
 " dist-upgrade - Perform an upgrade, possibly installing and removing "
@@ -1740,58 +1885,58 @@
 " dist-upgrade - Eguneraketa bat egin, ziurrenik paketak instalatu eta "
 "ezabatuaz\n"
 
-#: src/main.cc:104
+#: src/main.cc:103
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr " forget-new   - Ahaztu zein pakete den \"berria\"\n"
 
-#: src/main.cc:105
+#: src/main.cc:104
 #, 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:106
+#: src/main.cc:105
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr " show         - Bistaratu pakete baten azalpen zehatzak\n"
 
-#: src/main.cc:107
+#: src/main.cc:106
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr " clean        - Ezabatu deskargaturiko pakete fitxategiak\n"
 
-#: src/main.cc:108
+#: src/main.cc:107
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr " autoclean    - Ezabatu aurrerago deskargaturiko pakete fitxategiak\n"
 
-#: src/main.cc:109
+#: src/main.cc:108
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr " changelog    - Pakete baten aldaketa erregistro bistaratu\n"
 
-#: src/main.cc:110
+#: src/main.cc:109
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr " download     - Deskargatu pakete batentzat .deb fitxategia\n"
 
-#: src/main.cc:112
+#: src/main.cc:111
 #, c-format
 msgid "  Options:\n"
 msgstr "  (0)aukerak:\n"
 
-#: src/main.cc:113
+#: src/main.cc:112
 #, c-format
 msgid " -h             This help text\n"
 msgstr " -h             Laguntza testu hau\n"
 
-#: src/main.cc:114
+#: src/main.cc:113
 #, 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:115
+#: src/main.cc:114
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -1799,12 +1944,12 @@
 " -d             Paketeak deskargatu bakarrik, ez ezer ezabatu edo "
 "instalatu.\n"
 
-#: src/main.cc:116
+#: src/main.cc:115
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             Beti galdetu berrespen edo ekintzetan\n"
 
-#: src/main.cc:117
+#: src/main.cc:116
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
@@ -1812,7 +1957,7 @@
 " -y             Bai edo ez moduko galdera simpleetan erantzuna baiezkoa "
 "(yes) dela ezarri\n"
 
-#: src/main.cc:118
+#: src/main.cc:117
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -1821,7 +1966,7 @@
 " -F format      Ezarri emaitzetan erabili nahi duzun formatua, manuala "
 "begiratu\n"
 
-#: src/main.cc:119
+#: src/main.cc:118
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
@@ -1829,39 +1974,39 @@
 " -O ordena       Ezarri bilaketa emaitzak nola sailkatzea nahi duzun, "
 "manuala begiratu\n"
 
-#: src/main.cc:120
+#: src/main.cc:119
 #, 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:121
+#: src/main.cc:120
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 "-f              Apurturiko paketeak modu indartuan konpontzen saiatzen da.\n"
 
-#: src/main.cc:122
+#: src/main.cc:121
 #, 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:123
+#: src/main.cc:122
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 "-D              Erakutsi automatikoki aldatutako paketeen dependentziak.\n"
 
-#: src/main.cc:124
+#: src/main.cc:123
 #, 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:125
+#: src/main.cc:124
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
@@ -1869,19 +2014,19 @@
 " -v             Argibide xehetuak erakutsi.(bein baino gehiagotan erabil "
 "daiteke)\n"
 
-#: src/main.cc:126
+#: src/main.cc:125
 #, 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:127
+#: src/main.cc:126
 #, 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:128
+#: src/main.cc:127
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -1890,59 +2035,67 @@
 " --with(out)-recommends\tEzarri gomendioak(iradokizunak) dependetzia\n"
 "                indartsu bezala erabiltzea ala ez\n"
 
-#: src/main.cc:129
+#: src/main.cc:128
 #, 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:130
+#: src/main.cc:129
 #, c-format
 msgid " -u      : Download new package lists on startup.\n"
 msgstr " -u      : Abiaraztean pakete zerrenda berria deskargatu.\n"
 
-#: src/main.cc:131
+#: src/main.cc:130
 #, c-format
 msgid " -i      : Perform an install run on startup.\n"
 msgstr " -i      : Abiaraztean instalazio bat egin.\n"
 
-#: src/main.cc:133
+#: src/main.cc:132
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Aptitude honek ez ditu Super Behi potererik.\n"
 
-#: src/main.cc:254
+#: src/main.cc:253
 #, 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:300 src/main.cc:309
+#: src/main.cc:299 src/main.cc:308
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "arraroa: aukera ezezagun kodea jasorik\n"
 
-#: src/main.cc:318
+#: src/main.cc:317
 msgid "Only one of -u and -i may be specified\n"
 msgstr "-u eta -i artean bat bakarrik ezarri dezakezu\n"
 
-#: src/main.cc:326
+#: src/main.cc:325
 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:337
+#: src/main.cc:342
 msgid "-u and -i may not be specified with a command"
 msgstr "-u eta -i ezin dira komando batekin erabili"
 
-#: src/main.cc:392
+#: src/main.cc:399
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Komando ezezaguna \"%s\"\n"
 
-#: src/main.cc:400
+#: src/main.cc:406 src/main.cc:463
+msgid "Internal error: uncaught 'out of solutions' exception.\n"
+msgstr ""
+
+#: src/main.cc:411 src/main.cc:468
+msgid "Internal error: uncaught 'out of time' exception.\n"
+msgstr ""
+
+#: src/main.cc:418
 #, c-format
-msgid "Invalid option for interactive mode: -s\n"
-msgstr "Eukera baliogabeamodu interkatiboan: -s\n"
+msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
+msgstr ""
 
 #: src/mine/cmine.cc:93
 #, c-format
@@ -1970,7 +2123,7 @@
 msgid "Lost"
 msgstr "Galdu"
 
-#: src/mine/cmine.cc:119 src/ui.cc:1005
+#: src/mine/cmine.cc:119 src/ui.cc:1089
 msgid "Minesweeper"
 msgstr "Mina-aurkitzailea"
 
@@ -2146,7 +2299,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:1488
+#: src/pkg_columnizer.cc:84 src/ui.cc:1638
 msgid "Package"
 msgstr "Paketea"
 
@@ -2405,13 +2558,14 @@
 " 'base' ataleko paketeak hasierako debian instalatzailearen parte dira."
 
 #: 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 ""
 "Faxmodem eta bestealako komunikazio gailuentrzako programak\n"
 " 'comm' ataleko paketeak modemak eta bestelako komunikazio hardwarea "
@@ -2859,14 +3013,15 @@
 "'main' atalean daude."
 
 #: 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"
@@ -2928,11 +3083,12 @@
 " Paketea hauen bertsio berriago bat dago eskuragarri."
 
 #: 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 ""
 "Pakete Berriak\n"
 "Pakete hauek debianera gehitu dira zuk azkenez pakete berrien zerrenda "
@@ -3186,103 +3342,123 @@
 msgid "Versions"
 msgstr "Bertsioak"
 
-#: src/pkg_item.cc:54
+#: src/pkg_item.cc:55
 msgid "Yes, I am aware this is a very bad idea"
 msgstr "Bai, hau ideia txar bat dela ohartarzirik nago"
 
 #: src/pkg_item.cc:80
-#, c-format
+#, 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 beharrezko pakete bat da\n"
 "\n"
 "Ziur al zaude ezabatu nahi duzula?\n"
 "%s idatzi ziur bazaude."
 
-#: src/pkg_item.cc:219
+#: src/pkg_item.cc:222 src/pkg_ver_item.cc:625
 #, c-format
 msgid "Information about %s"
 msgstr "%s-ri buruz argibideak"
 
-#: src/pkg_item.cc:304
-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 "Honen bertsio erabilgarriak:"
 
-#: src/pkg_item.cc:312 src/pkg_ver_item.cc:648
+#: src/pkg_item.cc:313
+#, fuzzy, c-format
+msgid "%s versions"
+msgstr "Bertsioak"
+
+#: src/pkg_item.cc:325 src/pkg_ver_item.cc:655
 #, c-format
 msgid "Dependencies of %s"
 msgstr "%s-ren dependentziak"
 
-#: src/pkg_item.cc:322 src/pkg_ver_item.cc:657
+#: 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 "%s behar duten paketeak"
 
-#: src/pkg_item.cc:373 src/pkg_ver_item.cc:694
+#: 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 "%s-n arazo baten berri ematen\n"
 
-#: src/pkg_item.cc:395
+#: 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 ""
 "Zu ez zara rrot eta ezin dut zu root biurtzeko\n"
 "biderik. Pakete hau berkonfiguratzeko menu\n"
 "edo login paketa instalatu edo aptitude root\n"
 "bezala abiarazi."
 
-#: src/pkg_item.cc:403
+#: src/pkg_item.cc:422
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr "%s berkonfiguratzen\n"
 
-#: src/pkg_item.cc:428
+#: src/pkg_item.cc:447
 msgid "Hierarchy editor"
 msgstr "Jerarkia editorea"
 
+#: src/pkg_item.cc:447
+#, fuzzy
+msgid "Hierarchy Editor"
+msgstr "Jerarkia editorea"
+
 #: src/pkg_tree.cc:325
 msgid "Search for: "
 msgstr "Bilatu hau:"
 
-#: src/pkg_tree.cc:585
+#: src/pkg_tree.cc:568
 msgid "All Packages"
 msgstr "Pakete guztiak"
 
-#: src/pkg_tree.cc:598 src/pkg_tree.cc:607
+#: src/pkg_tree.cc:581 src/pkg_tree.cc:590
 msgid "Building view"
 msgstr "Ikuspegia eraikitzen"
 
-#: src/pkg_tree.cc:649
+#: src/pkg_tree.cc:632
 #, c-format
 msgid "No packages matched the pattern \"%s\"."
 msgstr "\"%s\" patroia betetzen duen paketerik ez da aurkitu."
 
-#: src/pkg_tree.cc:671
+#: src/pkg_tree.cc:654
 msgid "Enter the new package tree limit: "
 msgstr "Sartu pakete zuhaitz limite berria: "
 
-#: src/pkg_tree.cc:705
+#: src/pkg_tree.cc:688
 msgid "Enter the new package grouping mechanism for this display: "
 msgstr ""
 "Sar ikuspegi honetan erakutsi behar den pakete taldetze mekanismo berria:"
 
-#: src/pkg_tree.cc:713
+#: src/pkg_tree.cc:696
 msgid "Enter the new package sorting mechanism for this display: "
 msgstr ""
 "Sar ikuspegi honetan erakutsi behar den pakete biltze mekanismo berria:"
 
-#: src/pkg_ver_item.cc:623
-msgid "Information about "
-msgstr "Informazioa honi buruz: "
-
 #: src/pkg_view.cc:344
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr "make_package_view: errorea argumentuetan -- bi partaide nagusi??"
@@ -3298,7 +3474,7 @@
 msgid "make_package_view: bad argument!"
 msgstr "make_package_view: argumentu okerra!"
 
-#: src/pkg_view.cc:492
+#: src/pkg_view.cc:495
 msgid "make_package_view: no main widget found"
 msgstr "make_package_view: Ez da oinarrizko lanabesa aurkitu"
 
@@ -3514,6 +3690,74 @@
 "Hurrengo paketeak %B%s%b bertsiodun %B%s%b pakerea behar dute, eta buskatu "
 "litezke hau %s egingo balitz."
 
+#: 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 "Zenbait pakiete apurturik daude. Konpontzen saiatuko?"
+
+#: 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 "Dakar"
+
+#: src/solution_dialog.cc:147
+#, fuzzy
+msgid "Next"
+msgstr "Hurre^ngoa"
+
+#: src/solution_dialog.cc:148
+msgid "Apply"
+msgstr ""
+
+#: src/solution_dialog.cc:149
+#, fuzzy
+msgid "Close"
+msgstr "(^C)Itxi"
+
+#: src/solution_fragment.cc:125
+#, fuzzy
+msgid "%BRemove%b the following packages:%n"
+msgstr "Hurrengo paketeak APURTURIK daude:"
+
+#: src/solution_fragment.cc:135
+#, fuzzy
+msgid "%BInstall%b the following packages:%n"
+msgstr "Hurrengo paketeak APURTURIK daude:"
+
+#: 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 "Hurrengo paketeak APURTURIK daude:"
+
+#: src/solution_fragment.cc:176
+#, fuzzy
+msgid "%BDowngrade%b the following packages:%n"
+msgstr "Paketeak deskargatzen"
+
+#: src/solution_fragment.cc:190
+#, c-format
+msgid "Score is %d"
+msgstr ""
+
 #: src/trust.cc:17 src/trust.cc:19
 msgid "WARNING"
 msgstr ""
@@ -3525,52 +3769,52 @@
 "system."
 msgstr ""
 
-#: src/ui.cc:143
+#: src/ui.cc:164
 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:149
+#: src/ui.cc:170
 msgid "E:"
 msgstr ""
 
-#: src/ui.cc:151
+#: src/ui.cc:172
 msgid "W:"
 msgstr ""
 
-#: src/ui.cc:172
+#: src/ui.cc:193
 msgid "Search for:"
 msgstr "Bilatu honentzat:"
 
-#: src/ui.cc:205
+#: src/ui.cc:261
 msgid "You already are root!"
 msgstr "Zu dagoeneko root zara!"
 
-#: src/ui.cc:303
+#: src/ui.cc:359
 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:331
+#: src/ui.cc:387
 msgid "Loading cache"
 msgstr "Katxea kargatzen"
 
-#: src/ui.cc:353
+#: src/ui.cc:409
 msgid "Really quit Aptitude?"
 msgstr "Benetan Aptitude itxi?"
 
-#: src/ui.cc:432
+#: src/ui.cc:488
 msgid "Really discard your personal settings and reload the defaults?"
 msgstr "Benetan zure ezarpen pertsonalñak ezabatu eta lehentsietara itzuli?"
 
-#: src/ui.cc:532
+#: src/ui.cc:588 src/ui.cc:590 src/ui.cc:618 src/ui.cc:620
 msgid "Packages"
 msgstr "Paketeak"
 
-#: src/ui.cc:533 src/ui.cc:560
+#: src/ui.cc:589 src/ui.cc:619
 msgid "View available packages and choose actions to perform"
 msgstr "Pakete eskuragarriak ikusi eta egibeharreko ekintzak aukeratu"
 
-#: src/ui.cc:599
+#: src/ui.cc:666
 #, fuzzy
 msgid ""
 "%AAptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
@@ -3586,15 +3830,15 @@
 "lizentzia ikusi ditzazkezu. Hau Software librea da eta zenbait egoeratan "
 "(lizentzia ikusi xehetasunetarako) banatzeko aukera duzu."
 
-#: src/ui.cc:620
+#: src/ui.cc:687
 msgid "help.txt"
 msgstr "help.txt"
 
-#: src/ui.cc:636
+#: src/ui.cc:703
 msgid "README"
 msgstr "IRAKURRI"
 
-#: src/ui.cc:718
+#: src/ui.cc:785
 msgid ""
 "%C%BWARNING%b: untrusted versions of the following packages will be "
 "installed!%n%nUntrusted packages could %Bcompromise your system's security%"
@@ -3602,61 +3846,71 @@
 "this is what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:732
+#: src/ui.cc:799
 #, fuzzy
 msgid "Really Continue"
 msgstr "Jarraitu"
 
-#: src/ui.cc:734
+#: src/ui.cc:801
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:796
+#: src/ui.cc:862
 msgid "Preview of package installation"
 msgstr "Pakete instalazioaren aurreikuspena"
 
-#: src/ui.cc:797
+#: src/ui.cc:863
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Egingo diren ekintzak bistarazi eta/edo ezarri"
 
-#: src/ui.cc:837
-msgid "Some packages were broken and have been fixed"
+#: src/ui.cc:864
+#, fuzzy
+msgid "Preview"
+msgstr "(^P)Aurrekoa"
+
+#: src/ui.cc:900
+#, fuzzy
+msgid "Some packages were broken and have been fixed:"
 msgstr "Zenbait pakiete apurturik zeuden eta konponduak izan dira"
 
-#: src/ui.cc:839
-msgid "Some broken packages could not be fixed!"
-msgstr "Buskatutako zenbait pakete ezin dira konpondu!"
+#: src/ui.cc:906
+msgid "No solution to these dependency problems exists!"
+msgstr ""
 
-#: src/ui.cc:847 src/ui.cc:959
-msgid "Some packages are broken.  Try to fix them?"
-msgstr "Zenbait pakiete apurturik daude. Konpontzen saiatuko?"
+#: src/ui.cc:912
+#, c-format
+msgid ""
+"Ran out of time while trying to resolver dependencies (press \"%s\" to try "
+"harder)"
+msgstr ""
 
-#: src/ui.cc:860
+#: src/ui.cc:958
+#, 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 ""
 "Paketak instalu/ezabatzeak zuk une honetan ez dituzun kudeatzaiuile\n"
 "baimenak behar ditu. Root kontura aldatu nahi al duzu?\n"
 
-#: src/ui.cc:863 src/ui.cc:993
+#: src/ui.cc:961 src/ui.cc:1077
 msgid "Become root"
 msgstr "Root biurtu"
 
-#: src/ui.cc:865 src/ui.cc:995
+#: src/ui.cc:963 src/ui.cc:1079
 msgid "Don't become root"
 msgstr "Ez root biurtu"
 
-#: src/ui.cc:870 src/ui.cc:1000
+#: src/ui.cc:968 src/ui.cc:1084
 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:897
+#: src/ui.cc:995
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ez dago paketerik instalatu, ezabatu edo eguneratzeko aukeraturik."
 
-#: src/ui.cc:903
+#: src/ui.cc:1001
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -3668,164 +3922,179 @@
 "Zenbait pakete eguneratu daitezke baina zuk ez duzu eguneraketa aukeratu.\n"
 "\"U\" erabili danak eguneraketarako prestatzeko."
 
-#: src/ui.cc:990
+#: src/ui.cc:1073
+#, 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 ""
 "Pakete zerrenda eguneratzeak zuk ez dituzun kudeatzaile baimenak behar "
 "ditu.\n"
 "Root kontura aldatu nahi al duzu?\n"
 
-#: src/ui.cc:1005 src/ui.cc:1198
+#: src/ui.cc:1089 src/ui.cc:1345
 msgid "Waste time trying to find mines"
 msgstr "Minak aurkitzen saiatzen denbora pasa"
 
-#: src/ui.cc:1012 src/ui.cc:1065
+#: src/ui.cc:1096 src/ui.cc:1149
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Deskarga bat abiarazirik dagoenean ez da garbitzerik onartzen"
 
-#: src/ui.cc:1015
+#: src/ui.cc:1099
 msgid "Deleting downloaded files"
 msgstr "Deskargaturiko fitxategiak ezabatzen"
 
-#: src/ui.cc:1029
+#: src/ui.cc:1113
 msgid "Downloaded package files have been deleted"
 msgstr "Deskargaturiko pakete fitxategiak ezabatuak izan dira"
 
-#: src/ui.cc:1090
+#: src/ui.cc:1174
 #, 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:1174
+#: src/ui.cc:1246
+msgid "All solutions exhausted."
+msgstr ""
+
+#: src/ui.cc:1251 src/ui.cc:1282
+#, fuzzy
+msgid "Ran out of time while trying to find a solution."
+msgstr "Minak aurkitzen saiatzen denbora pasa"
+
+#: src/ui.cc:1276
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:1321
 msgid "^Install/remove packages"
 msgstr "^Paketeak Instalatu/Ezabatu"
 
-#: src/ui.cc:1175
+#: src/ui.cc:1322
 msgid "Perform all pending installs and removals"
 msgstr "Egin falta diren instalaketa eta ezabaketak"
 
-#: src/ui.cc:1177
+#: src/ui.cc:1324
 msgid "^Update package list"
 msgstr "^Eguneratu pakete Zerrenda"
 
-#: src/ui.cc:1178
+#: src/ui.cc:1325
 msgid "Check for new versions of packages"
 msgstr "Arakatu paketeen bertsio berrien bila"
 
-#: src/ui.cc:1181
+#: src/ui.cc:1328
 msgid "^Forget new packages"
 msgstr "(^F) Ahaztu pakete berriak"
 
-#: src/ui.cc:1182
+#: src/ui.cc:1329
 msgid "Forget which packages are \"new\""
 msgstr "Ahaztu zein pakete diren \"berriak\""
 
-#: src/ui.cc:1185
+#: src/ui.cc:1332
 msgid "^Clean package cache"
 msgstr "(^C) Garbitu pakete katxea"
 
-#: src/ui.cc:1186
+#: src/ui.cc:1333
 msgid "Delete package files which were previously downloaded"
 msgstr "Ezabatu lehen deskargaturiko pakete fitxategiak"
 
-#: src/ui.cc:1189
+#: src/ui.cc:1336
 msgid "Clean ^obsolete files"
 msgstr "Garbitu zaharkiturik^o fitxategiak"
 
-#: src/ui.cc:1190
+#: src/ui.cc:1337
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Ezabatu dafoenekeo deskargatu ezin diren fitxategiak"
 
-#: src/ui.cc:1193
+#: src/ui.cc:1340
 msgid "Mark ^Upgradable"
 msgstr "Eguneragarri Markat^u"
 
-#: src/ui.cc:1194
+#: src/ui.cc:1341
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Markatu hizozturik ez dauden pakete eguneragarri guzitak eguneratzeko"
 
-#: src/ui.cc:1197
+#: src/ui.cc:1344
 msgid "^Play Minesweeper"
 msgstr "(^P) Mina aurkitzailera jolastu"
 
-#: src/ui.cc:1200
+#: src/ui.cc:1347
 msgid "^Become root"
 msgstr "(^B) Root biurtu"
 
-#: src/ui.cc:1201
+#: src/ui.cc:1348
+#, 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 ""
 "Root bihurtzeko 'su' abiarazi.  Honek programa berabiarazi du\n"
 "baina ezarpenak gordeko dira."
 
-#: src/ui.cc:1204
+#: src/ui.cc:1351
 msgid "^Reload package cache"
 msgstr "^(R) PAkete katxea berritu"
 
-#: src/ui.cc:1205
+#: src/ui.cc:1352
 msgid "Reload the package cache"
 msgstr "Pakete katxea Berritu."
 
-#: src/ui.cc:1211
+#: src/ui.cc:1358
 msgid "^Quit"
 msgstr "^(Q) Irten"
 
-#: src/ui.cc:1212
+#: src/ui.cc:1359
 msgid "Exit the program"
 msgstr "Programatik irten"
 
-#: src/ui.cc:1218 src/ui.cc:1487
+#: src/ui.cc:1365 src/ui.cc:1637
 msgid "Undo"
 msgstr "Desegin"
 
-#: src/ui.cc:1219
+#: src/ui.cc:1366
 msgid "Undo the last package operation or group of operations"
 msgstr "Desegin azke patekete ekintza edo ekintza taldea"
 
-#: src/ui.cc:1226
+#: src/ui.cc:1373
 msgid "^Install"
 msgstr "^Instalatu"
 
-#: src/ui.cc:1227
+#: src/ui.cc:1374
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Aukeratutako paketea instalatu edo eguneratzeko markatu"
 
-#: src/ui.cc:1230
+#: src/ui.cc:1377
 msgid "^Remove"
 msgstr "^Ezabatu"
 
-#: src/ui.cc:1231
+#: src/ui.cc:1378
 msgid "Flag the currently selected package for removal"
 msgstr "Aukeratutako paketea ezabatzeko markatu"
 
-#: src/ui.cc:1234
+#: src/ui.cc:1381
 msgid "^Purge"
 msgstr "^Garbitu"
 
-#: src/ui.cc:1235
+#: src/ui.cc:1382
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Aukeratutako paketea eta bere konfigurazioak ezabatzeko markatu"
 
-#: src/ui.cc:1238
+#: src/ui.cc:1385
 msgid "^Keep"
 msgstr "^Mantendu"
 
-#: src/ui.cc:1239
+#: src/ui.cc:1386
 msgid "Cancel any action on the selected package"
 msgstr "Aukeratutako paketean edozein ekintza ezeztatu"
 
-#: src/ui.cc:1242
+#: src/ui.cc:1389
 msgid "^Hold"
 msgstr "^Hizoztu"
 
-#: src/ui.cc:1243
+#: src/ui.cc:1390
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -3833,250 +4102,254 @@
 "Aukeratutako paketean edozein ekintza ezeztatu eta aurreragotako "
 "eguneraketez babestu"
 
-#: src/ui.cc:1246
+#: src/ui.cc:1393
 msgid "Mark ^Auto"
 msgstr "^Auto markatu"
 
-#: src/ui.cc:1247
+#: src/ui.cc:1394
+#, 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 ""
 "Markatu aukeratutako paketea automatiko instalatu balitz bezala;\n"
 "beste paketerik behar ez duenean automatikoki ezabatua izango da"
 
-#: src/ui.cc:1250
+#: src/ui.cc:1397
 msgid "Mark ^Manual"
 msgstr "Markatau ^Manuala"
 
-#: src/ui.cc:1251
+#: src/ui.cc:1398
+#, 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 ""
 "Markatu aukeratutako paketea eskuz instalatua izan balitz bezala;\n"
 "berau ez da ezabatuko zuk eskuz ezabatu artean"
 
-#: src/ui.cc:1254
+#: src/ui.cc:1401
 msgid "^Forbid Version"
 msgstr "^Debekatutako Bertsioa"
 
-#: src/ui.cc:1255
+#: src/ui.cc:1402
+#, 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 ""
 "Debekatu aukeratutako paketearen aukerako bertsioa instalatzea;\n"
 "bertsio berragoak era arruntean kudeatuko dira"
 
-#: src/ui.cc:1259
+#: src/ui.cc:1406
 msgid "I^nformation"
 msgstr "I^nformazioa"
 
-#: src/ui.cc:1260
+#: src/ui.cc:1407
 msgid "Display more information about the selected package"
 msgstr "Aukeratutako paketeren argibide gehiago bistaratu"
 
-#: src/ui.cc:1263
+#: src/ui.cc:1410
 msgid "^Changelog"
 msgstr "^Aldaketa Erregistroa"
 
-#: src/ui.cc:1264
+#: src/ui.cc:1411
 msgid "Display the Debian changelog of the selected package"
 msgstr "Bistarazi aukeratutako paketearen aldaketa erregistroa"
 
-#: src/ui.cc:1271
+#: src/ui.cc:1418
 msgid "^Find"
 msgstr "^Bilatu"
 
-#: src/ui.cc:1272
+#: src/ui.cc:1419
 msgid "Search for a package"
 msgstr "Pakete bat bilatu"
 
-#: src/ui.cc:1275
+#: src/ui.cc:1422
 msgid "Find ^Again"
 msgstr "Bilatu ^Berriz"
 
-#: src/ui.cc:1276
+#: src/ui.cc:1423
 msgid "Repeat the last search"
 msgstr "Azken bilaketa errepikatu"
 
-#: src/ui.cc:1280
+#: src/ui.cc:1427
 msgid "^Limit Display"
 msgstr "^Bistaratze Mugatu"
 
-#: src/ui.cc:1281
+#: src/ui.cc:1428
 msgid "Apply a filter to the package list"
 msgstr "Pakete zerrendari iragazi bat ezarri"
 
-#: src/ui.cc:1284
+#: src/ui.cc:1431
 msgid "^Un-Limit Display"
 msgstr "^Bistaratze Muga kendu"
 
-#: src/ui.cc:1285
+#: src/ui.cc:1432
 msgid "Remove the filter from the package list"
 msgstr "Pakete zerrendari iragazia kendu"
 
-#: src/ui.cc:1289
+#: src/ui.cc:1436
 msgid "Find ^Broken"
 msgstr "^Bilatu Apurtua"
 
-#: src/ui.cc:1290
+#: src/ui.cc:1437
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Bilatu betegabeko dependentziak dituen hurrengo paketea"
 
-#: src/ui.cc:1297
+#: src/ui.cc:1444
 msgid "^UI options"
 msgstr "^UI aukerak"
 
-#: src/ui.cc:1298
+#: src/ui.cc:1445
 msgid "Change the settings which affect the user interface"
 msgstr "Erabiltzaile interfazeari dagozkion ezarpenak aldatu."
 
-#: src/ui.cc:1301
+#: src/ui.cc:1448
 msgid "^Dependency handling"
 msgstr "^Dependentzi kudeaketa"
 
-#: src/ui.cc:1302
+#: src/ui.cc:1449
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Pakete dependentziak kudeatzeko eraren ezarpenak aldatu"
 
-#: src/ui.cc:1305
+#: src/ui.cc:1452
 msgid "^Miscellaneous"
 msgstr "(^M) Bestelakoak"
 
-#: src/ui.cc:1306
+#: src/ui.cc:1453
 msgid "Change miscellaneous program settings"
 msgstr "Programaren beste ezarpen batzuk aldatu"
 
-#: src/ui.cc:1311
+#: src/ui.cc:1458
 msgid "^Revert options"
 msgstr "Auke^rak Atzeratu"
 
-#: src/ui.cc:1312
+#: src/ui.cc:1459
 msgid "Reset all settings to the system defaults"
 msgstr "Berezarri ezarpen guztiak sistema lehenetsietara"
 
-#: src/ui.cc:1323
+#: src/ui.cc:1470
 msgid "^Next"
 msgstr "Hurre^ngoa"
 
-#: src/ui.cc:1324
+#: src/ui.cc:1471
 msgid "View next display"
 msgstr "Ikusi hurrengo leihoa"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1474
 msgid "^Prev"
 msgstr "(^P)Aurrekoa"
 
-#: src/ui.cc:1328
+#: src/ui.cc:1475
 msgid "View previous display"
 msgstr "Ikusi aurreko leihoa"
 
-#: src/ui.cc:1331
+#: src/ui.cc:1478
 msgid "^Close"
 msgstr "(^C)Itxi"
 
-#: src/ui.cc:1332
+#: src/ui.cc:1479
 msgid "Close this display"
 msgstr "Itxi leiho hau"
 
-#: src/ui.cc:1337
+#: src/ui.cc:1484
 msgid "New Package ^View"
 msgstr "(^V) Paketea Berriak Ikusi"
 
-#: src/ui.cc:1338
+#: src/ui.cc:1485
 msgid "Create a new default package view"
 msgstr "Pakete bistaratze berri bat sortu"
 
-#: src/ui.cc:1341
+#: src/ui.cc:1488
 msgid "New Categorical ^Browser"
 msgstr "Sailkapen ^Berria Ikusi"
 
-#: src/ui.cc:1343
+#: src/ui.cc:1490
 msgid "Browse packages by category"
 msgstr "Paketeak sailez bistarazi."
 
-#: src/ui.cc:1351
+#: src/ui.cc:1498
 msgid "^About"
 msgstr "(^A)Honi buruz"
 
-#: src/ui.cc:1352
+#: src/ui.cc:1499
 msgid "View information about this program"
 msgstr "Programa honi buruzko argibideak ikusi"
 
-#: src/ui.cc:1355
+#: src/ui.cc:1502
 msgid "^Help"
 msgstr "(^H)Laguntza"
 
-#: src/ui.cc:1356
+#: src/ui.cc:1503
 msgid "View the on-line help"
 msgstr "Ikusi sare bidezko laguntza"
 
-#: src/ui.cc:1358
+#: src/ui.cc:1505
 msgid "User's ^Manual"
 msgstr "Erabiltzailearen ^Manuala"
 
-#: src/ui.cc:1359
+#: src/ui.cc:1506
 msgid "View the detailed program manual"
 msgstr "Ikusi programaren manual zehaztua"
 
-#: src/ui.cc:1362
+#: src/ui.cc:1509
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1363
+#: src/ui.cc:1510
 msgid "View a list of frequently asked questions"
 msgstr "Ikusi sarriago galdetutako galderen zerrenda?"
 
-#: src/ui.cc:1366
-msgid "^ChangeLog"
-msgstr "(^C) Erregistroa"
+#: src/ui.cc:1513
+msgid "^NEWS"
+msgstr ""
 
-#: src/ui.cc:1367
-msgid "View the important changes made in each version of the program"
+#: src/ui.cc:1514
+#, fuzzy
+msgid "View the important changes made in each version of "
 msgstr "Begiratu programen bertsio bakoitzean eginiko aldaketa garrantzitsuak"
 
-#: src/ui.cc:1370
+#: src/ui.cc:1517
 msgid "^License"
 msgstr "^Lizentzia"
 
-#: src/ui.cc:1371
+#: src/ui.cc:1518
 msgid "View the terms under which you may copy the program"
 msgstr "Begiratu zein egoeratan zuk programa kopiatu dezakezun"
 
-#: src/ui.cc:1486
+#: src/ui.cc:1636
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: src/ui.cc:1489
+#: src/ui.cc:1639
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/ui.cc:1490
+#: src/ui.cc:1640
 msgid "Options"
 msgstr "Aukerak"
 
-#: src/ui.cc:1491
+#: src/ui.cc:1641
 msgid "Views"
 msgstr "Ikuspegiak"
 
-#: src/ui.cc:1492
+#: src/ui.cc:1642
 msgid "Help"
 msgstr "Laguntza"
 
-#: src/ui.cc:1537
+#: src/ui.cc:1699
 #, 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:1799 src/vscreen/vscreen.cc:281
+#: src/ui.cc:1968 src/vscreen/vscreen.cc:281
 msgid "yes_key"
 msgstr "Bai_gakoa"
 
-#: src/ui.cc:1800 src/vscreen/vscreen.cc:282
+#: src/ui.cc:1969 src/vscreen/vscreen.cc:282
 msgid "no_key"
 msgstr "ez_gakoa"
 
@@ -4089,6 +4362,16 @@
 msgid "Downloading Changelog"
 msgstr "Deskargatzen Erregistro aldaketak"
 
+#: src/view_changelog.cc:54
+#, fuzzy
+msgid "Download Changelog"
+msgstr "Deskargatzen Erregistro aldaketak"
+
+#: src/view_changelog.cc:63
+#, c-format
+msgid "%s changes"
+msgstr ""
+
 #: src/vscreen/vscreen.cc:119
 #, c-format
 msgid "Ouch!  Got SIGTERM, dying..\n"
@@ -4117,6 +4400,38 @@
 msgid "No"
 msgstr "Ez"
 
+#~ 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 ""
+#~ "Pakete batenbatek betegabeko dependentziak ditu. Hauk zuk ezinezko den\n"
+#~ "egoera bat eskatu duzlako edo zuk distrbuzio ezegonkorra darabilkizu eta\n"
+#~ "dependentzia pakete batenbat ez da sortu orindik edo sarreratik kanpo\n"
+#~ "utzi da.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Please insert the following disc into the drive \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Mesedez sar hurrengo diska \"%s\" irakulean : \n"
+#~ "%s"
+
+#~ msgid "Invalid option for interactive mode: -s\n"
+#~ msgstr "Eukera baliogabeamodu interkatiboan: -s\n"
+
+#~ msgid "Information about "
+#~ msgstr "Informazioa honi buruz: "
+
+#~ msgid "Some broken packages could not be fixed!"
+#~ msgstr "Buskatutako zenbait pakete ezin dira konpondu!"
+
+#~ msgid "^ChangeLog"
+#~ msgstr "(^C) Erregistroa"
+
 #~ msgid "Go away, I'm trying to think.\n"
 #~ msgstr "Joan. Pentsatzen saiatzen ari nahiz.\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	Sat Apr 30 13:41:32 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-01-10 16:26-0800\n"
+"POT-Creation-Date: 2005-04-29 18:11-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,16 +151,103 @@
 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:184 src/vscreen/vs_util.cc:83 src/vscreen/vs_util.cc:97
-#: src/vscreen/vs_util.cc:329
+#: src/ui.cc:218 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:242 src/download_list.cc:71 src/mine/cmine.cc:257
-#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:329
+#: src/mine/cmine.cc:330 src/vscreen/vs_util.cc:328
 msgid "Cancel"
 msgstr "Peruuta"
 
+#: 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 "Ehdotukset"
+
+#: src/broken_indicator.cc:164
+#, fuzzy, c-format
+msgid "%d installs"
+msgstr "asenna"
+
+#: src/broken_indicator.cc:169
+#, fuzzy
+msgid "1 install"
+msgstr "asenna"
+
+#: 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 "päivitä"
+
+#: src/broken_indicator.cc:196
+#, fuzzy
+msgid "1 upgrade"
+msgstr "päivitä"
+
+#: src/broken_indicator.cc:200
+#, fuzzy, c-format
+msgid "%d downgrades"
+msgstr "vanhennus"
+
+#: src/broken_indicator.cc:205
+#, fuzzy
+msgid "1 downgrade"
+msgstr "vanhennus"
+
+#: 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 "^Seuraava"
+
+#: 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 ""
@@ -233,22 +320,22 @@
 msgstr ""
 "Paketti %s ei ole päivitettävissä, joten päivitystä ei ole tarpeen estää\n"
 
-#: src/cmdline/cmdline_action.cc:213
+#: src/cmdline/cmdline_action.cc:198
 #, 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:240
+#: src/cmdline/cmdline_action.cc:225
 #, 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:246
+#: src/cmdline/cmdline_action.cc:231
 #, 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:280
+#: src/cmdline/cmdline_action.cc:265
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -257,7 +344,7 @@
 "En löytänyt pakettia \"%s\" ja yli 40 paketin\n"
 "nimessä on merkkijono \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:283
+#: src/cmdline/cmdline_action.cc:268
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -266,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:307
+#: src/cmdline/cmdline_action.cc:292
 #, 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:309
+#: src/cmdline/cmdline_action.cc:294
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -281,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:312
+#: src/cmdline/cmdline_action.cc:297
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
@@ -326,13 +413,13 @@
 msgid "Freed %sB of disk space\n"
 msgstr "Vapauttaa %sB levytilaa"
 
-#: src/cmdline/cmdline_do_action.cc:67
+#: src/cmdline/cmdline_do_action.cc:71
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Virheellinen toiminto %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:201 src/cmdline/cmdline_simulate.cc:31
+#: src/cmdline/cmdline_upgrade.cc:91
 #, c-format
 msgid "Abort.\n"
 msgstr "Keskeytys.\n"
@@ -342,7 +429,7 @@
 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:342
+#: src/cmdline/cmdline_download.cc:43 src/download.cc:344
 msgid "Couldn't read source list"
 msgstr "En pystynyt lukemaan pakettivarastolistaa"
 
@@ -406,95 +493,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:44
+#: src/cmdline/cmdline_prompt.cc:45
 msgid "Couldn't read list of sources"
 msgstr "En pystynyt lukemaan pakettivarastolistaa"
 
-#: src/cmdline/cmdline_prompt.cc:219 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:220 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:222 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:223 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:225 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:226 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr "mutta %s on asennettu."
 
-#: src/cmdline/cmdline_prompt.cc:229 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:230 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:233 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:234 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:236 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:237 src/cmdline/cmdline_show_broken.cc:90
 #, c-format
 msgid " or"
 msgstr " tai"
 
-#: src/cmdline/cmdline_prompt.cc:248
+#: src/cmdline/cmdline_prompt.cc:249
 msgid "The following packages are BROKEN:"
 msgstr "Nämä paketit ovat RIKKI:"
 
-#: src/cmdline/cmdline_prompt.cc:249
+#: src/cmdline/cmdline_prompt.cc:250
 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:250
+#: src/cmdline/cmdline_prompt.cc:251
 msgid "The following packages have been automatically kept back:"
 msgstr "Nämä paketit on automaattisesti jätetty odottamaan:"
 
-#: src/cmdline/cmdline_prompt.cc:251
+#: src/cmdline/cmdline_prompt.cc:252
 msgid "The following NEW packages will be automatically installed:"
 msgstr "Nämä UUDET paketit asennetaan automaattisesti:"
 
-#: src/cmdline/cmdline_prompt.cc:252
+#: src/cmdline/cmdline_prompt.cc:253
 msgid "The following packages will be automatically REMOVED:"
 msgstr "Nämä paketit POISTETAAN automaattisesti:"
 
-#: src/cmdline/cmdline_prompt.cc:253
+#: src/cmdline/cmdline_prompt.cc:254
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nämä paketit VANHENNETAAN:"
 
-#: src/cmdline/cmdline_prompt.cc:254
+#: src/cmdline/cmdline_prompt.cc:255
 msgid "The following packages have been kept back:"
 msgstr "Nämä paketit on jätetty odottamaan:"
 
-#: src/cmdline/cmdline_prompt.cc:255
+#: src/cmdline/cmdline_prompt.cc:256
 msgid "The following packages will be REINSTALLED:"
 msgstr "Nämä paketit ASENNETAAN UUDESTAAN:"
 
-#: src/cmdline/cmdline_prompt.cc:256
+#: src/cmdline/cmdline_prompt.cc:257
 msgid "The following NEW packages will be installed:"
 msgstr "Nämä UUDET paketit asennetaan:"
 
-#: src/cmdline/cmdline_prompt.cc:257
+#: src/cmdline/cmdline_prompt.cc:258
 msgid "The following packages will be REMOVED:"
 msgstr "Nämä paketit POISTETAAN:"
 
-#: src/cmdline/cmdline_prompt.cc:258
+#: src/cmdline/cmdline_prompt.cc:259
 msgid "The following packages will be upgraded:"
 msgstr "Nämä paketit päivitetään:"
 
-#: src/cmdline/cmdline_prompt.cc:307
+#: src/cmdline/cmdline_prompt.cc:311
 #, 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:316
+#: src/cmdline/cmdline_prompt.cc:320
 #, 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:326
+#: src/cmdline/cmdline_prompt.cc:330
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -503,96 +590,99 @@
 "VAROITUS: Tämä toiminto luultavasti hajoittaa järjestelmäsi!\n"
 "          ÄLÄ jatka, ellet tiedä VARMASTI, mitä teet!\n"
 
-#: src/cmdline/cmdline_prompt.cc:328
+#: src/cmdline/cmdline_prompt.cc:332
 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:331
+#: src/cmdline/cmdline_prompt.cc:335
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Kirjoita \"%s\" jatkaaksesi:\n"
 
-#: src/cmdline/cmdline_prompt.cc:434
+#: src/cmdline/cmdline_prompt.cc:438
 #, 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:440
+#: src/cmdline/cmdline_prompt.cc:444
 #, 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:445
+#: src/cmdline/cmdline_prompt.cc:449
 #, 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:447
+#: src/cmdline/cmdline_prompt.cc:451
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu päivitettyä pakettia, %lu uutta asennusta, "
 
-#: src/cmdline/cmdline_prompt.cc:451
+#: src/cmdline/cmdline_prompt.cc:455
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu uudelleen asennettua, "
 
-#: src/cmdline/cmdline_prompt.cc:453
+#: src/cmdline/cmdline_prompt.cc:457
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu vanhennettua, "
 
-#: src/cmdline/cmdline_prompt.cc:455
+#: src/cmdline/cmdline_prompt.cc:459
 #, 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:462
+#: src/cmdline/cmdline_prompt.cc:466
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Tarvitsee noutaa %sB/%sB arkistoista. "
 
-#: src/cmdline/cmdline_prompt.cc:465
+#: src/cmdline/cmdline_prompt.cc:469
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Tarvitsee noutaa %sB arkistoista. "
 
-#: src/cmdline/cmdline_prompt.cc:472
+#: src/cmdline/cmdline_prompt.cc:476
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Levytilaa kuluu %sB purkamisen jälkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:475
+#: src/cmdline/cmdline_prompt.cc:479
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Levytilaa vapautuu %sB purkamisen jälkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:521
+#: src/cmdline/cmdline_prompt.cc:524
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Virheellinen komentomerkki '%c'\n"
 
-#: src/cmdline/cmdline_prompt.cc:596
+#: src/cmdline/cmdline_prompt.cc:595
 #, 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:598 src/cmdline/cmdline_prompt.cc:629
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:597
 msgid "Press Return to continue."
 msgstr "Paina Return jatkaaksesi."
 
-#: src/cmdline/cmdline_prompt.cc:625
+#: src/cmdline/cmdline_prompt.cc:623
 #, 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:665
-#, c-format
+#: src/cmdline/cmdline_prompt.cc:627
+#, fuzzy
+msgid "Press Return to continue"
+msgstr "Paina Return jatkaaksesi."
+
+#: src/cmdline/cmdline_prompt.cc:675
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Haluatko jatkaa? [Kyllä=y/ei=n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:690
+#: src/cmdline/cmdline_prompt.cc:700
 #, c-format
 msgid ""
 "\n"
@@ -603,7 +693,7 @@
 "Riippuvuustiedot näytetään.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:692
+#: src/cmdline/cmdline_prompt.cc:702
 #, c-format
 msgid ""
 "\n"
@@ -614,7 +704,7 @@
 "Riippuvuustietoja ei näytetä.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:698
+#: src/cmdline/cmdline_prompt.cc:708
 #, c-format
 msgid ""
 "\n"
@@ -625,7 +715,7 @@
 "Versiot näytetään.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:700
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid ""
 "\n"
@@ -636,7 +726,7 @@
 "Versioita ei näytetä.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:705
+#: src/cmdline/cmdline_prompt.cc:715
 #, c-format
 msgid ""
 "\n"
@@ -647,7 +737,7 @@
 "Kokojen muutokset näytetään.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:717
 #, c-format
 msgid ""
 "\n"
@@ -658,7 +748,7 @@
 "Kokojen muutoksia ei näytetä.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:737
 #, c-format
 msgid ""
 "Commands:\n"
@@ -708,34 +798,86 @@
 "  _ : Siivoa\n"
 "  = : Jäädytä\n"
 
-#: src/cmdline/cmdline_prompt.cc:751
+#: src/cmdline/cmdline_prompt.cc:761
 #, 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
+#, c-format
+msgid "y: %F%nn: %F%nq: %F%n,: %F%n.: %F%n"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:90
+msgid "accept the proposed changes"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:92
+msgid "reject the proposed changes and search for another solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:94
+#, fuzzy
+msgid "give up and quit the program"
+msgstr "Poistu ohjelmasta"
+
+#: src/cmdline/cmdline_resolver.cc:96
+msgid "move to the next solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:98
+msgid "move to the previous solution"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:131
+#, 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/?]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:174
+msgid "Abandoning all efforts to resolve these dependencies."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:184
+#, fuzzy
+msgid "The following commands are available:"
+msgstr "Nämä paketit ovat RIKKI:"
+
+#: src/cmdline/cmdline_resolver.cc:188
+#, 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
+msgid "No solution found within the allotted time.  Try harder? [Y/n]"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:226
+#, 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
+msgid "Unable to resolve dependencies!  Giving up..."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:240
+msgid "No more solutions."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:78
 #, c-format
 msgid "search: You must provide at least one search term\n"
 msgstr "search: Ainakin yksi hakuehto tarvitaan\n"
 
-# This needs to be synchronized with apt's translation, if that ever happens
-# JJK
-#: 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 ""
-"Joidenkin pakettien riippuvuuksia ei voinut tyydyttää.  Tämä voi johtua\n"
-"antamistasi mahdottomista vaatimuksista tai, jos käytät epävakaata jakelua,\n"
-"siitä, ettei joitakin vaadittuja paketteja ole vielä saatavilla.\n"
-"\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 "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:\n"
@@ -933,12 +1075,12 @@
 msgid "Description: "
 msgstr "Kuvaus: "
 
-#: src/cmdline/cmdline_simulate.cc:36
+#: src/cmdline/cmdline_simulate.cc:37
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr "Noutaisi tai asentaisi tai poistaisi paketteja.\n"
 
-#: src/cmdline/cmdline_simulate.cc:47
+#: src/cmdline/cmdline_simulate.cc:48
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Sisäinen virhe, järjestäminen ei onnistunut"
 
@@ -980,26 +1122,24 @@
 msgid "UNAVAILABLE"
 msgstr "EI SAATAVILLA"
 
-#: src/download_bar.cc:57 src/download_list.cc:265
+#: 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 "Aseta asemaan \"%s\" levyke nimeltä \"%s\""
+msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
+msgstr "Aseta levyke nimeltä \"%s\" asemaan \"%s\""
 
-#: src/download_bar.cc:76 src/generic/acqprogress.cc:63
+#: src/download_bar.cc:77 src/generic/acqprogress.cc:63
 msgid "Hit "
 msgstr "Löytyi "
 
-#: src/download_bar.cc:89
+#: src/download_bar.cc:90
 msgid "Downloading "
 msgstr "Nouto: "
 
-#: src/download_bar.cc:102
+#: src/download_bar.cc:103
 msgid "Got "
 msgstr "Noudettu: "
 
-#: src/download_bar.cc:156
+#: src/download_bar.cc:157
 msgid "Downloading..."
 msgstr "Noudan..."
 
@@ -1007,7 +1147,7 @@
 msgid "Couldn't read list of package sources"
 msgstr "En pystynyt lukemaan pakettivarastolistaa"
 
-#: src/download.cc:104 src/download.cc:321
+#: src/download.cc:104 src/download.cc:322
 msgid "Couldn't lock list directory..are you root?"
 msgstr "En pystynyt lukitsemaan listahakemistoa - oletko varmasti root?"
 
@@ -1019,29 +1159,33 @@
 msgid "View the progress of the package list update"
 msgstr "Seuraa pakettilistojen päivityksen edistymistä"
 
-#: src/download.cc:159
+#: src/download.cc:113
+msgid "List Update"
+msgstr ""
+
+#: src/download.cc:160
 msgid "Couldn't clean out list directories"
 msgstr "En pystynyt siivoamaan listahakemistoja"
 
-#: src/download.cc:176 src/ui.cc:1068
+#: src/download.cc:177 src/ui.cc:1152
 msgid "Deleting obsolete downloaded files"
 msgstr "Poistan vanhentuneita tiedostoja"
 
-#: src/download.cc:181
+#: src/download.cc:182
 #, c-format
 msgid "Deleting obsolete downloaded files\n"
 msgstr "Poistan vanhentuneita noudettuja tiedostoja\n"
 
-#: src/download.cc:223
+#: src/download.cc:224
 #, c-format
 msgid "Unable to open %s to log actions"
 msgstr "En pystynyt avaaamaan %s:a lokitiedostoksi"
 
-#: src/download.cc:229
+#: src/download.cc:230
 msgid "log report"
 msgstr "loki"
 
-#: src/download.cc:230
+#: src/download.cc:231
 #, c-format
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
@@ -1052,77 +1196,77 @@
 "epäonnistuu dpkg:n ongelmien takia, sitä ei välttämättä suoritettu.\n"
 "\n"
 
-#: src/download.cc:231
+#: src/download.cc:232
 #, c-format
 msgid "Will install %li packages, and remove %li packages.\n"
 msgstr "Asennetaan %li pakettia ja poistetaan %li pakettia.\n"
 
-#: src/download.cc:233
+#: src/download.cc:234
 #, c-format
 msgid "%sB of disk space will be used\n"
 msgstr "%s tavua levytilaa kuluu\n"
 
-#: src/download.cc:236
+#: src/download.cc:237
 #, c-format
 msgid "%sB bytes of disk space will be freed\n"
 msgstr "%s tavua levytilaa vapautuu\n"
 
-#: src/download.cc:244
+#: src/download.cc:245
 #, c-format
 msgid "[UPGRADE] %s %s -> %s\n"
 msgstr "[PÄIVITYS] %s %s -> %s\n"
 
-#: src/download.cc:248
+#: src/download.cc:249
 #, c-format
 msgid "[DOWNGRADE] %s %s -> %s\n"
 msgstr "[VANHENNUS] %s %s -> %s\n"
 
-#: src/download.cc:258
+#: src/download.cc:259
 msgid "REMOVE"
 msgstr "POISTO"
 
-#: src/download.cc:264
+#: src/download.cc:265
 msgid "INSTALL"
 msgstr "ASENNUS"
 
-#: src/download.cc:267
+#: src/download.cc:268
 msgid "REINSTALL"
 msgstr "UUDELLEENASENNUS"
 
-#: src/download.cc:270
+#: src/download.cc:271
 msgid "HOLD"
 msgstr "JÄISSÄ"
 
-#: src/download.cc:273
+#: src/download.cc:274
 msgid "BROKEN"
 msgstr "RIKKI"
 
-#: src/download.cc:276
+#: src/download.cc:277
 msgid "REMOVE, NOT USED"
 msgstr "POISTO, KÄYTTÄMÄTÖN"
 
-#: src/download.cc:279
+#: src/download.cc:280
 msgid "REMOVE, DEPENDENCIES"
 msgstr "POISTO, RIIPPUVUUDET"
 
-#: src/download.cc:282
+#: src/download.cc:283
 msgid "INSTALL, DEPENDENCIES"
 msgstr "ASENNUS, RIIPPUVUUDET"
 
-#: src/download.cc:285
+#: src/download.cc:286
 msgid "HOLD, DEPENDENCIES"
 msgstr "JÄISSÄ, RIIPPUVUUDET"
 
-#: src/download.cc:287
+#: src/download.cc:288
 msgid "????????"
 msgstr "????????"
 
-#: