.po updates courtesy of msgmerge/"make dist".

1 files changed, 1369 insertions, 854 deletions

diff --git a/po/th.po b/po/th.po
index 89a0e0e4..3f9e294f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2009-01-18 16:00-0800\n"
+"POT-Creation-Date: 2009-04-22 23:16-0700\n"
 "PO-Revision-Date: 2008-05-06 12:52+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -478,81 +478,82 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/broken_indicator.cc:126
+#: src/broken_indicator.cc:128
 #, c-format
 msgid "%ls: Examine"
 msgstr ""
 
-#: src/broken_indicator.cc:135
+#: src/broken_indicator.cc:137
 #, c-format
 msgid "%ls: Apply"
 msgstr ""
 
-#: src/broken_indicator.cc:140
+#: src/broken_indicator.cc:142
 #, c-format
 msgid "%ls: Next"
 msgstr ""
 
-#: src/broken_indicator.cc:146
+#: src/broken_indicator.cc:148
 #, c-format
 msgid "%ls: Previous"
 msgstr ""
 
-#: src/broken_indicator.cc:241
+#: src/broken_indicator.cc:243
 msgid "Dependency resolution disabled."
 msgstr ""
 
-#: src/broken_indicator.cc:252
+#: src/broken_indicator.cc:254
 msgid "Unable to resolve dependencies."
 msgstr ""
 
-#: src/broken_indicator.cc:263
+#: src/broken_indicator.cc:265
 msgid "Fatal error in resolver"
 msgstr ""
 
-#: src/broken_indicator.cc:275
+#: src/broken_indicator.cc:277
 #, c-format
 msgid "[%d(%d)/...] Resolving dependencies"
 msgstr ""
 
-#: src/broken_indicator.cc:311 src/gtk/resolver.cc:307 src/gtk/resolver.cc:488
-#: src/solution_dialog.cc:140 src/solution_screen.cc:542
+#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1182
+#: src/gtk/resolver.cc:1350 src/solution_dialog.cc:140
+#: src/solution_screen.cc:568
 msgid "Internal error: unexpected null solution."
 msgstr ""
 
-#: src/broken_indicator.cc:366
+#: src/broken_indicator.cc:367
 msgid "Suggest keeping all packages at their current version."
 msgstr ""
 
-#: src/broken_indicator.cc:374
+#: src/broken_indicator.cc:375
 #, c-format
 msgid "%d install"
 msgid_plural "%d installs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/broken_indicator.cc:384
+#: src/broken_indicator.cc:385
 #, c-format
 msgid "%d removal"
 msgid_plural "%d removals"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/broken_indicator.cc:394
+#: src/broken_indicator.cc:395
 #, c-format
 msgid "%d keep"
 msgid_plural "%d keeps"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/broken_indicator.cc:404
+#: src/broken_indicator.cc:405
 #, c-format
 msgid "%d upgrade"
 msgid_plural "%d upgrades"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/broken_indicator.cc:414
+#: src/broken_indicator.cc:415
 #, c-format
 msgid "%d downgrade"
 msgid_plural "%d downgrades"
@@ -562,7 +563,7 @@ msgstr[1] ""
 #. ForTranslators: %F is replaced with a comma separated list such as
 #. "n1 installs, n2 removals", ...
 #.
-#: src/broken_indicator.cc:425
+#: src/broken_indicator.cc:426
 #, c-format
 msgid "Suggest %F"
 msgstr ""
@@ -572,125 +573,125 @@ msgstr ""
 msgid "Unable to find the source package for \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:204
+#: src/cmdline/cmdline_action.cc:205
 #, c-format
-msgid "Unable to satisfy the build-depends: %s."
+msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:240
+#: src/cmdline/cmdline_action.cc:241
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:247
+#: src/cmdline/cmdline_action.cc:248
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:269
+#: src/cmdline/cmdline_action.cc:270
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
 "real package and no package provides it.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:277
+#: src/cmdline/cmdline_action.cc:278
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:280
+#: src/cmdline/cmdline_action.cc:281
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:288
+#: src/cmdline/cmdline_action.cc:289
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:307
+#: src/cmdline/cmdline_action.cc:308
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:313
+#: src/cmdline/cmdline_action.cc:314
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:320 src/cmdline/cmdline_action.cc:326
+#: src/cmdline/cmdline_action.cc:321 src/cmdline/cmdline_action.cc:327
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:344
+#: src/cmdline/cmdline_action.cc:345
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:346
+#: src/cmdline/cmdline_action.cc:347
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:440
+#: src/cmdline/cmdline_action.cc:441
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:474
+#: src/cmdline/cmdline_action.cc:475
 #, c-format
 msgid ""
 "You can only specify a package version with an 'install' command or a "
 "'forbid-version' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:483
+#: src/cmdline/cmdline_action.cc:484
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:520
+#: src/cmdline/cmdline_action.cc:521
 #, 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:523
+#: src/cmdline/cmdline_action.cc:524
 #, 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:545
+#: src/cmdline/cmdline_action.cc:546
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:547
+#: src/cmdline/cmdline_action.cc:548
 #, 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:550
+#: src/cmdline/cmdline_action.cc:551
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
 "packages contain \"%s\" in their description:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:689
+#: src/cmdline/cmdline_action.cc:690
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr ""
@@ -755,7 +756,7 @@ msgid ""
 msgstr ""
 
 #: src/cmdline/cmdline_do_action.cc:313 src/cmdline/cmdline_simulate.cc:35
-#: src/cmdline/cmdline_upgrade.cc:175 src/main.cc:757
+#: src/cmdline/cmdline_upgrade.cc:181 src/main.cc:1037
 #, c-format
 msgid "Abort.\n"
 msgstr ""
@@ -854,129 +855,115 @@ msgstr ""
 msgid "Couldn't read list of sources"
 msgstr ""
 
-#. ForTranslators: %s is replaced with a comma-delimited list
-#. of package names.
-#: src/cmdline/cmdline_prompt.cc:223
-#, c-format
-msgid "(for %s)"
-msgid_plural "(for %s)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/cmdline/cmdline_prompt.cc:298 src/cmdline/cmdline_show.cc:437
-#: src/cmdline/cmdline_why.cc:194 src/gtk/dependency_chains_tab.cc:199
-msgid "Provides"
-msgstr ""
-
-#: src/cmdline/cmdline_prompt.cc:431
+#: src/cmdline/cmdline_prompt.cc:322
 msgid "Config files"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:535 src/cmdline/cmdline_show_broken.cc:73
+#: src/cmdline/cmdline_prompt.cc:426 src/cmdline/cmdline_show_broken.cc:73
 #, c-format
 msgid "but %s is to be installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:538 src/cmdline/cmdline_show_broken.cc:76
+#: src/cmdline/cmdline_prompt.cc:429 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:541 src/cmdline/cmdline_show_broken.cc:79
+#: src/cmdline/cmdline_prompt.cc:432 src/cmdline/cmdline_show_broken.cc:79
 #, c-format
 msgid "but %s is installed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:545
+#: src/cmdline/cmdline_prompt.cc:436
 #, c-format
 msgid "but it is not installable"
 msgstr "แต่ไม่สามารถติดตั้งได้"
 
-#: src/cmdline/cmdline_prompt.cc:549 src/cmdline/cmdline_show_broken.cc:93
+#: src/cmdline/cmdline_prompt.cc:440 src/cmdline/cmdline_show_broken.cc:93
 #, c-format
 msgid " which is a virtual package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:552 src/cmdline/cmdline_show_broken.cc:96
+#: src/cmdline/cmdline_prompt.cc:443 src/cmdline/cmdline_show_broken.cc:96
 #, c-format
 msgid " or"
 msgstr " หรือ"
 
-#: src/cmdline/cmdline_prompt.cc:566
+#: src/cmdline/cmdline_prompt.cc:457
 msgid "The following packages are BROKEN:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:567
+#: src/cmdline/cmdline_prompt.cc:458
 msgid "The following packages are unused and will be REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:568
+#: src/cmdline/cmdline_prompt.cc:459
 msgid "The following packages have been automatically kept back:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:569
+#: src/cmdline/cmdline_prompt.cc:460
 msgid "The following NEW packages will be automatically installed:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:570
+#: src/cmdline/cmdline_prompt.cc:461
 msgid "The following packages will be automatically REMOVED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:571
+#: src/cmdline/cmdline_prompt.cc:462
 msgid "The following packages will be DOWNGRADED:"
 msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
 
-#: src/cmdline/cmdline_prompt.cc:572
+#: src/cmdline/cmdline_prompt.cc:463
 msgid "The following packages have been kept back:"
 msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
 
-#: src/cmdline/cmdline_prompt.cc:573
+#: src/cmdline/cmdline_prompt.cc:464
 msgid "The following packages will be REINSTALLED:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:574
+#: src/cmdline/cmdline_prompt.cc:465
 msgid "The following NEW packages will be installed:"
 msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:466
 msgid "The following packages will be REMOVED:"
 msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:467
 msgid "The following packages will be upgraded:"
 msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
 
-#: src/cmdline/cmdline_prompt.cc:577
+#: src/cmdline/cmdline_prompt.cc:468
 msgid "The following partially installed packages will be configured:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:632 src/ui.cc:1509
+#: src/cmdline/cmdline_prompt.cc:523 src/ui.cc:1510
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:641 src/ui.cc:1524
+#: src/cmdline/cmdline_prompt.cc:532 src/ui.cc:1525
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:651 src/ui.cc:1537
+#: src/cmdline/cmdline_prompt.cc:542 src/ui.cc:1538
 #, 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:653
+#: src/cmdline/cmdline_prompt.cc:544
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:657 src/ui.cc:1538
+#: src/cmdline/cmdline_prompt.cc:548 src/ui.cc:1539
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:699
+#: src/cmdline/cmdline_prompt.cc:590
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -987,14 +974,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:711
+#: src/cmdline/cmdline_prompt.cc:602
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  %s::CmdLine::Ignore-Trust-Violations is 'true'!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:720
+#: src/cmdline/cmdline_prompt.cc:611
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1005,7 +992,7 @@ msgstr ""
 #. input methods.  Please include nothing but ASCII characters.
 #. The text preceding the pipe character (|) will be ignored and
 #. can be removed from your translation.
-#: src/cmdline/cmdline_prompt.cc:731
+#: src/cmdline/cmdline_prompt.cc:622
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1014,202 +1001,202 @@ msgstr ""
 #. input methods.  Please include nothing but ASCII characters.
 #. The text preceding the pipe character (|) will be ignored and
 #. can be removed from your translation.
-#: src/cmdline/cmdline_prompt.cc:737
+#: src/cmdline/cmdline_prompt.cc:628
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:748
+#: src/cmdline/cmdline_prompt.cc:639
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:640
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:766
+#: src/cmdline/cmdline_prompt.cc:657
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:881
+#: src/cmdline/cmdline_prompt.cc:772
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:887
+#: src/cmdline/cmdline_prompt.cc:778
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:892
+#: src/cmdline/cmdline_prompt.cc:783
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:894
+#: src/cmdline/cmdline_prompt.cc:785
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:898
+#: src/cmdline/cmdline_prompt.cc:789
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: src/cmdline/cmdline_prompt.cc:900
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ปรับรุ่นลง %lu, "
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:793
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:800
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:912
+#: src/cmdline/cmdline_prompt.cc:803
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:919
+#: src/cmdline/cmdline_prompt.cc:810
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:922
+#: src/cmdline/cmdline_prompt.cc:813
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:943
+#: src/cmdline/cmdline_prompt.cc:834
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:949
+#: src/cmdline/cmdline_prompt.cc:840
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:960
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:964
+#: src/cmdline/cmdline_prompt.cc:855
 msgid "Press Return to continue"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:974
+#: src/cmdline/cmdline_prompt.cc:865
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
 "package to justify.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:997
+#: src/cmdline/cmdline_prompt.cc:890
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:999
+#: src/cmdline/cmdline_prompt.cc:892
 msgid "continue with the installation"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1001
+#: src/cmdline/cmdline_prompt.cc:894
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1003
+#: src/cmdline/cmdline_prompt.cc:896
 msgid "abort and quit"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1005
+#: src/cmdline/cmdline_prompt.cc:898
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1007
+#: src/cmdline/cmdline_prompt.cc:900
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1009
+#: src/cmdline/cmdline_prompt.cc:902
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1011
+#: src/cmdline/cmdline_prompt.cc:904
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1013
+#: src/cmdline/cmdline_prompt.cc:906
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1015
+#: src/cmdline/cmdline_prompt.cc:908
 msgid "toggle the display of dependency information"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1017
+#: src/cmdline/cmdline_prompt.cc:910
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1019
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "toggle the display of changes in package sizes"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1021
+#: src/cmdline/cmdline_prompt.cc:914
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1023
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "toggle the display of version numbers"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1025
+#: src/cmdline/cmdline_prompt.cc:918
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1027
+#: src/cmdline/cmdline_prompt.cc:920
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1030
+#: src/cmdline/cmdline_prompt.cc:923
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1032
+#: src/cmdline/cmdline_prompt.cc:925
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1034
+#: src/cmdline/cmdline_prompt.cc:927
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:929
 msgid "enter the full visual interface"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1039
+#: src/cmdline/cmdline_prompt.cc:932
 msgid ""
 "You may also specify modification to the actions which will be taken.  To do "
 "so, type an action character followed by one or more package names (or "
@@ -1217,73 +1204,73 @@ msgid ""
 "The following actions are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1046 src/cmdline/cmdline_resolver.cc:204
+#: src/cmdline/cmdline_prompt.cc:939 src/cmdline/cmdline_resolver.cc:208
 msgid "'+' to install packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1049 src/cmdline/cmdline_resolver.cc:206
+#: src/cmdline/cmdline_prompt.cc:942 src/cmdline/cmdline_resolver.cc:210
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1051 src/cmdline/cmdline_resolver.cc:208
+#: src/cmdline/cmdline_prompt.cc:944 src/cmdline/cmdline_resolver.cc:212
 msgid "'-' to remove packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1053 src/cmdline/cmdline_resolver.cc:210
+#: src/cmdline/cmdline_prompt.cc:946 src/cmdline/cmdline_resolver.cc:214
 msgid "'_' to purge packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1055 src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_prompt.cc:948 src/cmdline/cmdline_resolver.cc:216
 msgid "'=' to place packages on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1057 src/cmdline/cmdline_resolver.cc:214
+#: src/cmdline/cmdline_prompt.cc:950 src/cmdline/cmdline_resolver.cc:218
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1059 src/cmdline/cmdline_resolver.cc:216
+#: src/cmdline/cmdline_prompt.cc:952 src/cmdline/cmdline_resolver.cc:220
 msgid "'&M' to mark packages as automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1061 src/cmdline/cmdline_resolver.cc:218
+#: src/cmdline/cmdline_prompt.cc:954 src/cmdline/cmdline_resolver.cc:222
 msgid "'&m' to mark packages as manually installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1063
+#: src/cmdline/cmdline_prompt.cc:956
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1067
+#: src/cmdline/cmdline_prompt.cc:960
 msgid "Commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1176
+#: src/cmdline/cmdline_prompt.cc:1069
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1194
+#: src/cmdline/cmdline_prompt.cc:1087
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1195
+#: src/cmdline/cmdline_prompt.cc:1088
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1213
+#: src/cmdline/cmdline_prompt.cc:1106
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1219
+#: src/cmdline/cmdline_prompt.cc:1112
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1250
+#: src/cmdline/cmdline_prompt.cc:1143
 #, c-format
 msgid ""
 "\n"
@@ -1291,7 +1278,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1252
+#: src/cmdline/cmdline_prompt.cc:1145
 #, c-format
 msgid ""
 "\n"
@@ -1299,7 +1286,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1258
+#: src/cmdline/cmdline_prompt.cc:1151
 #, c-format
 msgid ""
 "\n"
@@ -1307,7 +1294,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1260
+#: src/cmdline/cmdline_prompt.cc:1153
 #, c-format
 msgid ""
 "\n"
@@ -1315,7 +1302,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1265
+#: src/cmdline/cmdline_prompt.cc:1158
 #, c-format
 msgid ""
 "\n"
@@ -1323,7 +1310,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1267
+#: src/cmdline/cmdline_prompt.cc:1160
 #, c-format
 msgid ""
 "\n"
@@ -1331,256 +1318,244 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:91 src/cmdline/cmdline_resolver.cc:715
-#: src/generic/apt/apt.cc:275
+#: src/cmdline/cmdline_resolver.cc:94 src/cmdline/cmdline_resolver.cc:727
+#: src/generic/apt/apt.cc:284
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:97 src/cmdline/cmdline_resolver.cc:720
+#: src/cmdline/cmdline_resolver.cc:100 src/cmdline/cmdline_resolver.cc:732
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:99 src/cmdline/cmdline_resolver.cc:722
+#: src/cmdline/cmdline_resolver.cc:102 src/cmdline/cmdline_resolver.cc:734
 msgid "Resolver state successfully written!"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:162
+#: src/cmdline/cmdline_resolver.cc:166
 #, c-format
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
 "n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:182
+#: src/cmdline/cmdline_resolver.cc:186
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:188
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:186
+#: src/cmdline/cmdline_resolver.cc:190
 msgid "give up and quit the program"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:192
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:190
+#: src/cmdline/cmdline_resolver.cc:194
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:192
+#: src/cmdline/cmdline_resolver.cc:196
 msgid ""
 "toggle between the contents of the solution and an explanation of the "
 "solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:194
+#: src/cmdline/cmdline_resolver.cc:198
 msgid "examine the solution in the visual user interface"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:196
+#: src/cmdline/cmdline_resolver.cc:200
 msgid ""
 "abort automatic dependency resolution; resolve dependencies by hand instead"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:202
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur.  Enter UNINST instead of a version to reject removing the package."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:200
+#: src/cmdline/cmdline_resolver.cc:204
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur.  Enter UNINST instead of a version to accept removing the package."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:202
+#: src/cmdline/cmdline_resolver.cc:206
 msgid "adjust the state of the listed packages, where ACTION is one of:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:220
+#: src/cmdline/cmdline_resolver.cc:224
 msgid ""
 "Adjustments will cause the current solution to be discarded and recalculated "
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:234
+#: src/cmdline/cmdline_resolver.cc:238
 #, c-format
 msgid "The version %s is available in the following archives:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:242
+#: src/cmdline/cmdline_resolver.cc:246
 #, c-format
 msgid "Select the version of %s that should be used: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:249
+#: src/cmdline/cmdline_resolver.cc:253
 #, c-format
 msgid "Invalid response.  Please enter an integer between 1 and %d."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:264
+#: src/cmdline/cmdline_resolver.cc:268
 #, c-format
 msgid "Expected at least one package/version pair following '%c'"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:278
+#: src/cmdline/cmdline_resolver.cc:282
 #, c-format
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:288
+#: src/cmdline/cmdline_resolver.cc:292
 #, c-format
 msgid "No such package \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:304
+#: src/cmdline/cmdline_resolver.cc:308
 #, c-format
 msgid "%s has no version named \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:321
+#: src/cmdline/cmdline_resolver.cc:325
 #, c-format
 msgid "Allowing the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:324
+#: src/cmdline/cmdline_resolver.cc:328
 #, c-format
 msgid "Allowing the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:334
+#: src/cmdline/cmdline_resolver.cc:338
 #, c-format
 msgid "Rejecting the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:337
+#: src/cmdline/cmdline_resolver.cc:341
 #, c-format
 msgid "Rejecting the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:350
+#: src/cmdline/cmdline_resolver.cc:354
 #, c-format
 msgid "No longer requiring the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:353
+#: src/cmdline/cmdline_resolver.cc:357
 #, c-format
 msgid "No longer requiring the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:362
+#: src/cmdline/cmdline_resolver.cc:366
 #, c-format
 msgid "Requiring the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:365
+#: src/cmdline/cmdline_resolver.cc:369
 #, c-format
 msgid "Requiring the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:507
+#: src/cmdline/cmdline_resolver.cc:535
+#, c-format
+msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:558
 #, c-format
 msgid ""
 "Would resolve dependencies, but dependency resolution is disabled.\n"
 "   (%s::ProblemResolver::StepLimit = 0)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:516
+#: src/cmdline/cmdline_resolver.cc:567
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:530 src/gtk/resolver.cc:614
-#: src/solution_dialog.cc:127 src/solution_screen.cc:519
+#: src/cmdline/cmdline_resolver.cc:581 src/cmdline/cmdline_resolver.cc:874
+#: src/gtk/resolver.cc:1935 src/solution_dialog.cc:127
+#: src/solution_screen.cc:545
 msgid "Resolving dependencies..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:562
-#, c-format
-msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:615
+#: src/cmdline/cmdline_resolver.cc:627
 msgid "The following actions will resolve these dependencies:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:632
+#: src/cmdline/cmdline_resolver.cc:644
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:659 src/cmdline/cmdline_resolver.cc:766
+#: src/cmdline/cmdline_resolver.cc:671 src/cmdline/cmdline_resolver.cc:778
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:662
+#: src/cmdline/cmdline_resolver.cc:674
 msgid ""
 "Abandoning automatic dependency resolution and reverting to manual "
 "resolution."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:692
+#: src/cmdline/cmdline_resolver.cc:704
 msgid "The following commands are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:712
+#: src/cmdline/cmdline_resolver.cc:724
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:727
+#: src/cmdline/cmdline_resolver.cc:739
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:740
+#: src/cmdline/cmdline_resolver.cc:752
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:769
+#: src/cmdline/cmdline_resolver.cc:781
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:778
+#: src/cmdline/cmdline_resolver.cc:790
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:784
+#: src/cmdline/cmdline_resolver.cc:796
 msgid "*** No more solutions available ***"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:803
+#: src/cmdline/cmdline_resolver.cc:815
 msgid ""
 "*** ERROR: search aborted by fatal exception.  You may continue\n"
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:983
-msgid ""
-"The resolver timed out after producing a solution; some possible upgrades "
-"might not be performed."
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:990
+#: src/cmdline/cmdline_resolver.cc:890
 msgid ""
 "Unable to resolve dependencies for the upgrade (the resolver timed out)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1007
+#: src/cmdline/cmdline_resolver.cc:896
 msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1019
-#, c-format
-msgid ""
-"Dependency resolution incomplete (%s); some possible upgrades might not be "
-"performed."
-msgstr ""
-
-#: src/cmdline/cmdline_resolver.cc:1025
+#: src/cmdline/cmdline_resolver.cc:902
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgstr ""
@@ -1613,7 +1588,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:172 src/cmdline/cmdline_show.cc:416
-#: src/gtk/resolver.cc:218 src/solution_fragment.cc:58
+#: src/gtk/resolver.cc:1085 src/solution_fragment.cc:60
 msgid "<NULL>"
 msgstr ""
 
@@ -1690,13 +1665,14 @@ msgid " [held]"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:299
-#, c-format
-msgid "%s; will be installed"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%lu reinstalled, "
+msgid "%s%s; will be installed"
+msgstr "ติดตั้งซ้ำ %lu, "
 
 #: src/cmdline/cmdline_show.cc:301
 #, c-format
-msgid "%s; will be installed automatically"
+msgid "%s%s; will be installed automatically"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:321
@@ -1735,7 +1711,7 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:383 src/gtk/gui.cc:91
+#: src/cmdline/cmdline_show.cc:383 src/gtk/gui.cc:96
 msgid "Forbidden version"
 msgstr ""
 
@@ -1747,7 +1723,7 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:391 src/gtk/packagestab.cc:665
+#: src/cmdline/cmdline_show.cc:391 src/gtk/packagestab.cc:722
 #: src/gtk/previewtab.cc:225
 msgid "Version: "
 msgstr ""
@@ -1802,11 +1778,11 @@ msgstr "ต้องใช้"
 msgid "PreDepends"
 msgstr "ต้องใช้ขณะติดตั้ง"
 
-#: src/cmdline/cmdline_show.cc:425 src/cmdline/cmdline_why.cc:263
+#: src/cmdline/cmdline_show.cc:425 src/cmdline/cmdline_why.cc:320
 msgid "Recommends"
 msgstr "ควรใช้ร่วมกับ"
 
-#: src/cmdline/cmdline_show.cc:427 src/cmdline/cmdline_why.cc:266
+#: src/cmdline/cmdline_show.cc:427 src/cmdline/cmdline_why.cc:323
 msgid "Suggests"
 msgstr "แนะนำ"
 
@@ -1826,14 +1802,19 @@ msgstr "แทนที่"
 msgid "Obsoletes"
 msgstr "ใช้แทน"
 
-#: src/cmdline/cmdline_show.cc:441 src/gtk/info.cc:692
-#: src/gtk/packagestab.cc:673 src/gtk/previewtab.cc:233
+#: src/cmdline/cmdline_show.cc:437 src/cmdline/cmdline_why.cc:251
+#: src/cmdline/cmdline_why.cc:1507 src/gtk/dependency_chains_tab.cc:200
+msgid "Provides"
+msgstr ""
+
+#: src/cmdline/cmdline_show.cc:441 src/gtk/info.cc:702
+#: src/gtk/packagestab.cc:730 src/gtk/previewtab.cc:233
 #: src/pkg_info_screen.cc:102
 msgid "Description: "
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:447 src/pkg_info_screen.cc:107
-#: src/pkg_view.cc:255
+#: src/pkg_view.cc:256
 msgid "Homepage: "
 msgstr ""
 
@@ -1866,7 +1847,11 @@ msgstr ""
 msgid "E: The update command takes no arguments\n"
 msgstr ""
 
-#: src/cmdline/cmdline_upgrade.cc:59
+#: src/cmdline/cmdline_upgrade.cc:56
+msgid "The \"upgrade\" command is now named \"safe-upgrade\"."
+msgstr ""
+
+#: src/cmdline/cmdline_upgrade.cc:62
 #, c-format
 msgid "E: The %s command takes no arguments\n"
 msgstr ""
@@ -1956,139 +1941,155 @@ msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_why.cc:254
+#: src/cmdline/cmdline_why.cc:311
 msgid "dep_level"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:260
+#: src/cmdline/cmdline_why.cc:317
 msgid "DependsOnly"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:274
+#: src/cmdline/cmdline_why.cc:331
 msgid "version_selection"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:279
+#: src/cmdline/cmdline_why.cc:336
 msgid "Current"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:282
+#: src/cmdline/cmdline_why.cc:339
 msgid "Candidate"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:285 src/gtk/aptitude.glade:1906
-#: src/gtk/gui.cc:84 src/gtk/gui.cc:1144
+#: src/cmdline/cmdline_why.cc:342 src/gtk/aptitude.glade:622 src/gtk/gui.cc:89
+#: src/gtk/gui.cc:1365
 msgid "Install"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:288
+#: src/cmdline/cmdline_why.cc:345
 msgid "InstallNotCurrent"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:296
+#: src/cmdline/cmdline_why.cc:353
 msgid "allow_choices"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:299
+#: src/cmdline/cmdline_why.cc:356
 msgid "true"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:301
+#: src/cmdline/cmdline_why.cc:358
 msgid "false"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:355
+#: src/cmdline/cmdline_why.cc:412
 #, c-format
 msgid "Install(%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:357
+#: src/cmdline/cmdline_why.cc:414
 #, c-format
 msgid "Remove(%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:359
+#: src/cmdline/cmdline_why.cc:416
 #, c-format
 msgid "Install(%s provides %s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:363
+#: src/cmdline/cmdline_why.cc:420
 #, c-format
 msgid "Remove(%s provides %s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:421
+#: src/cmdline/cmdline_why.cc:478
 #, c-format
 msgid "    ++ Examining %F\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:431
+#: src/cmdline/cmdline_why.cc:488
 msgid "    ++   --> skipping, not a conflict\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:441
+#: src/cmdline/cmdline_why.cc:498
 msgid "    ++   --> skipping conflict\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:449
+#: src/cmdline/cmdline_why.cc:506
 msgid "    ++   --> skipping, not relevant according to params\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:456
+#: src/cmdline/cmdline_why.cc:513
 msgid "    ++   --> skipping, parent is not the selected version\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:496
+#: src/cmdline/cmdline_why.cc:553
 msgid "    ++   --> skipping, the dep is satisfied by the current version\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:529
+#: src/cmdline/cmdline_why.cc:586
 msgid "    ++   --> ENQUEUING\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:536
+#: src/cmdline/cmdline_why.cc:593
 msgid "    ++   --> skipping, version check failed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:554
+#: src/cmdline/cmdline_why.cc:611
 #, c-format
 msgid "    ++   --> ENQUEUING %s Provides %s\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:688
+#: src/cmdline/cmdline_why.cc:745
 #, c-format
 msgid "Starting search with parameters %ls\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:903
+#: src/cmdline/cmdline_why.cc:963
 msgid "Skipping this solution, I've already seen it.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1005
+#: src/cmdline/cmdline_why.cc:1090
 #, c-format
 msgid "Unable to find a reason to remove %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1007
+#: src/cmdline/cmdline_why.cc:1092
 #, c-format
 msgid "Unable to find a reason to install %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1052 src/cmdline/cmdline_why.cc:1078
-#: src/cmdline/cmdline_why.cc:1133
+#: src/cmdline/cmdline_why.cc:1131
+#, c-format
+msgid "Packages requiring %s:"
+msgstr ""
+
+#: src/cmdline/cmdline_why.cc:1184 src/cmdline/cmdline_why.cc:1211
+#: src/cmdline/cmdline_why.cc:1270
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1082
+#: src/cmdline/cmdline_why.cc:1215
 msgid "Unable to parse some match patterns."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1106
+#: src/cmdline/cmdline_why.cc:1243
 #, c-format
-msgid "%s: this command requires at least one argument (the package to query)."
+msgid ""
+"%s: this command requires at least one argument (the package to query).\n"
 msgstr ""
 
+#: src/cmdline/cmdline_why.h:202
+msgid "Unknown version selection, something is very wrong."
+msgstr ""
+
+#: src/cmdline_parse.cc:22
+#, fuzzy, c-format
+#| msgid "Invalid operation %s"
+msgid "Invalid command-line option '%s'"
+msgstr "ไม่รู้จักคำสั่ง %s"
+
 #: src/dep_item.cc:148
 msgid "UNSATISFIED"
 msgstr ""
@@ -2097,7 +2098,7 @@ msgstr ""
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1110
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144
 msgid "Tags"
 msgstr ""
 
@@ -2129,7 +2130,7 @@ msgstr ""
 msgid "%n%nSome files were not downloaded successfully."
 msgstr ""
 
-#: src/download_list.cc:98 src/download_list.cc:345 src/gtk/download.cc:389
+#: src/download_list.cc:98 src/download_list.cc:345 src/gtk/download.cc:444
 msgid "Continue"
 msgstr ""
 
@@ -2160,12 +2161,12 @@ msgstr ""
 msgid "Downloading... "
 msgstr ""
 
-#: src/download_list.cc:340 src/gtk/download.cc:386
+#: src/download_list.cc:340 src/gtk/download.cc:441
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr ""
 
-#: src/download_list.cc:347 src/gtk/download.cc:390
+#: src/download_list.cc:347 src/gtk/download.cc:445
 msgid "Abort"
 msgstr ""
 
@@ -2177,6 +2178,10 @@ msgstr ""
 msgid "[ERROR]"
 msgstr ""
 
+#: src/download_thread.h:136
+msgid "Attempt to start a download thread twice!"
+msgstr ""
+
 #: src/edit_pkg_hier.cc:192
 msgid "No hierarchy information to edit"
 msgstr ""
@@ -2218,77 +2223,77 @@ msgid ""
 "press [Enter].\n"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:269
+#: src/generic/apt/aptcache.cc:271
 #, c-format
 msgid ""
 "Error parsing a user-tag for the package %s: unexpected end-of-line "
 "following %s."
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:286
+#: src/generic/apt/aptcache.cc:288
 #, c-format
 msgid "Unterminated '\"' in the user-tags list of the package %s."
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:390
+#: src/generic/apt/aptcache.cc:392
 msgid "Can't open Aptitude extended state file"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:404 src/generic/apt/aptcache.cc:492
-#: src/generic/apt/aptcache.cc:494
+#: src/generic/apt/aptcache.cc:406 src/generic/apt/aptcache.cc:494
+#: src/generic/apt/aptcache.cc:496
 msgid "Reading extended state information"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:499 src/generic/apt/aptcache.cc:581
-#: src/generic/apt/aptcache.cc:584
+#: src/generic/apt/aptcache.cc:501 src/generic/apt/aptcache.cc:583
+#: src/generic/apt/aptcache.cc:586
 msgid "Initializing package states"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:712
+#: src/generic/apt/aptcache.cc:744
 msgid "Cannot open Aptitude state file"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:716 src/generic/apt/aptcache.cc:822
-#: src/generic/apt/aptcache.cc:825
+#: src/generic/apt/aptcache.cc:748 src/generic/apt/aptcache.cc:854
+#: src/generic/apt/aptcache.cc:857
 msgid "Writing extended state information"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:813
+#: src/generic/apt/aptcache.cc:845
 msgid "Couldn't write state file"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:830
+#: src/generic/apt/aptcache.cc:862
 msgid "Error writing state file"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:848
+#: src/generic/apt/aptcache.cc:880
 #, c-format
 msgid "failed to remove %s"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:855
+#: src/generic/apt/aptcache.cc:887
 #, c-format
 msgid "failed to rename %s to %s"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:863
+#: src/generic/apt/aptcache.cc:895
 #, c-format
 msgid "couldn't replace %s with %s"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:1483
+#: src/generic/apt/aptcache.cc:1515
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:1802
+#: src/generic/apt/aptcache.cc:2162
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 
-#: src/generic/apt/aptcache.cc:1809
+#: src/generic/apt/aptcache.cc:2169
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
 
-#: src/generic/apt/aptcache.cc:1812
+#: src/generic/apt/aptcache.cc:2172
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 
@@ -2302,52 +2307,103 @@ msgstr ""
 #. indicated by translating "Localized defaults|" below to
 #. "aptitude-defaults.ww".  If you use this mechanism, you should
 #. also add your defaults file to pkgdata_DATA in Makefile.am.
-#: src/generic/apt/apt.cc:174
+#: src/generic/apt/apt.cc:183
 msgid "Localized defaults|"
 msgstr ""
 
-#: src/generic/apt/apt.cc:247
+#: src/generic/apt/apt.cc:256
 #, c-format
 msgid "%s is readable but not writable; unable to write configuration file."
 msgstr ""
 
-#: src/generic/apt/apt.cc:285
+#: src/generic/apt/apt.cc:301
 #, c-format
 msgid "Unable to replace %s with new configuration file"
 msgstr ""
 
-#: src/generic/apt/apt.cc:384
+#: src/generic/apt/apt.cc:452
 msgid ""
 "Could not lock the cache file; this usually means that dpkg or another apt "
 "tool is already installing packages.  Opening in read-only mode; any changes "
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:170
+#: src/generic/apt/aptitude_resolver.cc:460
 #, c-format
 msgid "Invalid hint \"%s\": expected an action, but found nothing."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:188
+#: src/generic/apt/aptitude_resolver.cc:482
+#, c-format
+msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:504
 #, c-format
 msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:213
+#: src/generic/apt/aptitude_resolver.cc:531
 #, c-format
 msgid "Invalid hint \"%s\": invalid target: %s"
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:231
+#: src/generic/apt/aptitude_resolver.cc:551
 #, c-format
 msgid "Invalid hint \"%s\": trailing junk after the version."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:310
+#: src/generic/apt/aptitude_resolver.cc:635
+#, c-format
+msgid ""
+"Invalid hint \"%s\": the action \"%s\" should be \"approve\", \"reject\", or "
+"a number."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:827
 #, c-format
 msgid ""
-"Invalid hint: the action \"%s\" should be \"approve\", \"reject\", or a "
-"number."
+"Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:871
+msgid "Safe actions"
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:872
+msgid "Cancel all user actions"
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:873
+#, fuzzy
+#| msgid "Removing %s"
+msgid "Remove packages"
+msgstr "กำลังถอดถอน %s"
+
+#: src/generic/apt/aptitude_resolver_universe.cc:874
+msgid "Modify held packages"
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:875
+msgid "Install versions from non-default sources"
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:876
+msgid "Remove essential packages"
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:909
+#, c-format
+msgid ""
+"The tier \"%s\", configured in %s::ProblemResolver::Tier-Names, is missing a "
+"Tier entry."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:913
+#, c-format
+msgid ""
+"The tier %d, configured in %s::ProblemResolver::Tier-Names, is missing a "
+"Name entry."
 msgstr ""
 
 #: src/generic/apt/download_install_manager.cc:60
@@ -2386,6 +2442,11 @@ msgstr ""
 msgid "Couldn't read list of package sources"
 msgstr ""
 
+#: src/generic/apt/download_update_manager.cc:138
+#, c-format
+msgid "Unterminated quoted string in command: %s"
+msgstr ""
+
 #: src/generic/apt/download_update_manager.cc:214
 #, c-format
 msgid "fork() failed: %s"
@@ -2458,6 +2519,12 @@ msgstr ""
 msgid "Unable to stat %s."
 msgstr "ไม่สามารถ stat %s"
 
+#: src/generic/apt/dump_packages.cc:674
+#, fuzzy, c-format
+#| msgid "Unable to locate package %s"
+msgid "Unable to create truncated cache: %s."
+msgstr "ไม่พบแพกเกจ %s"
+
 #: src/generic/apt/log.cc:54
 #, c-format
 msgid "Unable to open %s to log actions"
@@ -2692,6 +2759,16 @@ msgstr ""
 msgid "Multiple descriptions found for group %s, ignoring one"
 msgstr ""
 
+#: src/generic/apt/resolver_manager.cc:481
+#, c-format
+msgid "Unable to create the output file: child killed by signal %d."
+msgstr ""
+
+#: src/generic/apt/resolver_manager.cc:483
+#, c-format
+msgid "Unable to create the output file: child exited with status %d."
+msgstr ""
+
 #: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
 msgid "Building tag database"
 msgstr ""
@@ -2720,27 +2797,27 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: src/generic/util/util.cc:273
+#: src/generic/util/util.cc:291
 #, c-format
 msgid "Unable to stat \"%s\""
 msgstr ""
 
-#: src/generic/util/util.cc:279
+#: src/generic/util/util.cc:297
 #, c-format
 msgid "Unable to remove \"%s\""
 msgstr ""
 
-#: src/generic/util/util.cc:289
+#: src/generic/util/util.cc:307
 #, c-format
 msgid "Unable to list files in \"%s\""
 msgstr ""
 
-#: src/generic/util/util.cc:306
+#: src/generic/util/util.cc:324
 #, c-format
 msgid "Failure closing directory \"%s\""
 msgstr ""
 
-#: src/generic/util/util.cc:312
+#: src/generic/util/util.cc:330
 #, c-format
 msgid "Unable to remove directory \"%s\""
 msgstr ""
@@ -2753,7 +2830,7 @@ msgstr ""
 msgid "_File"
 msgstr ""
 
-#: src/gtk/aptitude.glade:26 src/ui.cc:2219
+#: src/gtk/aptitude.glade:26 src/ui.cc:2220
 msgid "Perform all pending installs and removals"
 msgstr ""
 
@@ -2761,7 +2838,7 @@ msgstr ""
 msgid "_Install/Remove Packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:42 src/ui.cc:2222
+#: src/gtk/aptitude.glade:42 src/ui.cc:2223
 msgid "Check for new versions of packages"
 msgstr ""
 
@@ -2769,7 +2846,7 @@ msgstr ""
 msgid "_Update Package List"
 msgstr ""
 
-#: src/gtk/aptitude.glade:63 src/ui.cc:2227
+#: src/gtk/aptitude.glade:63 src/ui.cc:2228
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
@@ -2777,7 +2854,7 @@ msgstr ""
 msgid "Mark Up_gradable"
 msgstr ""
 
-#: src/gtk/aptitude.glade:79 src/ui.cc:2232
+#: src/gtk/aptitude.glade:79 src/ui.cc:2233
 msgid "Forget which packages are \"new\""
 msgstr ""
 
@@ -2785,7 +2862,7 @@ msgstr ""
 msgid "_Forget New Packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:94 src/ui.cc:2236
+#: src/gtk/aptitude.glade:94 src/ui.cc:2237
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 
@@ -2793,7 +2870,7 @@ msgstr ""
 msgid "Canc_el Pending Actions"
 msgstr ""
 
-#: src/gtk/aptitude.glade:109 src/ui.cc:2240
+#: src/gtk/aptitude.glade:109 src/ui.cc:2241
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
@@ -2801,7 +2878,7 @@ msgstr ""
 msgid "C_lean Package Cache"
 msgstr ""
 
-#: src/gtk/aptitude.glade:124 src/ui.cc:2244
+#: src/gtk/aptitude.glade:124 src/ui.cc:2245
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
@@ -2811,7 +2888,7 @@ msgstr ""
 msgid "Clean _Obsolete Files"
 msgstr "ใช้แทน"
 
-#: src/gtk/aptitude.glade:144 src/ui.cc:2251
+#: src/gtk/aptitude.glade:144 src/ui.cc:2252
 msgid "Reload the package cache"
 msgstr ""
 
@@ -2819,7 +2896,7 @@ msgstr ""
 msgid "_Reload Package Cache"
 msgstr ""
 
-#: src/gtk/aptitude.glade:159 src/ui.cc:1700 src/ui.cc:2256
+#: src/gtk/aptitude.glade:159 src/ui.cc:1701 src/ui.cc:2257
 msgid "Waste time trying to find mines"
 msgstr ""
 
@@ -2827,7 +2904,7 @@ msgstr ""
 msgid "_Play Minesweeper"
 msgstr ""
 
-#: src/gtk/aptitude.glade:179 src/ui.cc:2261
+#: src/gtk/aptitude.glade:179 src/ui.cc:2262
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
@@ -2837,7 +2914,7 @@ msgstr ""
 msgid "_Become Root"
 msgstr ""
 
-#: src/gtk/aptitude.glade:194 src/ui.cc:2264
+#: src/gtk/aptitude.glade:194 src/ui.cc:2265
 msgid "Exit the program"
 msgstr ""
 
@@ -2849,7 +2926,7 @@ msgstr ""
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:220 src/ui.cc:2271
+#: src/gtk/aptitude.glade:220 src/ui.cc:2272
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
@@ -2907,121 +2984,151 @@ msgstr ""
 msgid "Find _Dependency Chains"
 msgstr ""
 
-#: src/gtk/aptitude.glade:344
+#: src/gtk/aptitude.glade:345
+msgid "gtk-go-back"
+msgstr ""
+
+#: src/gtk/aptitude.glade:355
+msgid "gtk-go-forward"
+msgstr ""
+
+#: src/gtk/aptitude.glade:365 src/gtk/aptitude.glade:765
+msgid "gtk-close"
+msgstr ""
+
+#: src/gtk/aptitude.glade:379
 msgid "_Help"
 msgstr ""
 
-#: src/gtk/aptitude.glade:352
+#: src/gtk/aptitude.glade:387
 msgid "gtk-about"
 msgstr ""
 
-#: src/gtk/aptitude.glade:372 src/gtk/aptitude.glade:671
-#: src/gtk/dashboardtab.cc:234 src/gtk/gui.cc:1320 src/gtk/gui.cc:1511
+#: src/gtk/aptitude.glade:407 src/gtk/dashboardtab.cc:750 src/gtk/gui.cc:1550
+#: src/gtk/gui.cc:1744
 msgid "Dashboard"
 msgstr ""
 
-#: src/gtk/aptitude.glade:391
+#: src/gtk/aptitude.glade:422
 msgid "Update"
 msgstr ""
 
-#: src/gtk/aptitude.glade:401 src/gtk/aptitude.glade:883 src/gtk/gui.cc:1050
-#: src/ui.cc:837 src/ui.cc:839 src/ui.cc:884 src/ui.cc:886 src/ui.cc:912
-#: src/ui.cc:914 src/ui.cc:935 src/ui.cc:937
+#: src/gtk/aptitude.glade:432 src/gtk/gui.cc:1266 src/ui.cc:837 src/ui.cc:839
+#: src/ui.cc:884 src/ui.cc:886 src/ui.cc:912 src/ui.cc:914 src/ui.cc:935
+#: src/ui.cc:937
 msgid "Packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:411 src/gtk/aptitude.glade:1191 src/gtk/gui.cc:755
-#: src/gtk/previewtab.cc:116 src/ui.cc:1336
+#: src/gtk/aptitude.glade:442 src/gtk/gui.cc:977 src/gtk/previewtab.cc:116
+#: src/ui.cc:1336
 msgid "Preview"
 msgstr ""
 
-#: src/gtk/aptitude.glade:421 src/gtk/aptitude.glade:1352 src/gtk/gui.cc:750
-#: src/ui.cc:2652
+#: src/gtk/aptitude.glade:452 src/gtk/gui.cc:972 src/ui.cc:2653
 msgid "Resolver"
 msgstr ""
 
-#: src/gtk/aptitude.glade:431
+#: src/gtk/aptitude.glade:462
 msgid "Install/Remove"
 msgstr ""
 
-#: src/gtk/aptitude.glade:462 src/gtk/aptitude.glade:748
-#: src/gtk/aptitude.glade:1418 src/gtk/aptitude.glade:1555
-msgid "Search:"
+#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372
+msgid "Remove"
 msgstr ""
 
-#: src/gtk/aptitude.glade:482 src/gtk/aptitude.glade:768
-#: src/gtk/aptitude.glade:1438 src/gtk/aptitude.glade:1575
-msgid "gtk-find"
+#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377
+msgid "Purge"
 msgstr ""
 
-#: src/gtk/aptitude.glade:500 src/gtk/aptitude.glade:786
-#: src/gtk/aptitude.glade:1381 src/gtk/aptitude.glade:1456
-#: src/gtk/aptitude.glade:1593
-#, fuzzy
-#| msgid "Err "
-msgid "Errors"
-msgstr "ปัญหา "
+#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382
+msgid "Keep"
+msgstr ""
 
-#: src/gtk/aptitude.glade:580
-msgid "Upgrade Summary"
+#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387
+msgid "Hold"
 msgstr ""
 
-#: src/gtk/aptitude.glade:609
-msgid "Selected Package"
+#: src/gtk/aptitude.glade:687
+msgid "Edit Columns..."
 msgstr ""
 
-#: src/gtk/aptitude.glade:637 src/gtk/gui.cc:86 src/gtk/gui.cc:1135
-msgid "Upgrade"
+#: src/gtk/aptitude.glade:700
+msgid "Dummy label (will be replaced at runtime)."
 msgstr ""
 
-#: src/gtk/aptitude.glade:654
-msgid "<b>Available Upgrades:</b>"
+#: src/gtk/aptitude.glade:731
+msgid "Make this the default for new package lists."
 msgstr ""
 
-#: src/gtk/aptitude.glade:702 src/gtk/tab.cc:64
-msgid "Download"
+#: src/gtk/aptitude.glade:747
+msgid "Apply these settings to all active package lists."
+msgstr ""
+
+#: src/gtk/aptitude.glade:811 src/gtk/aptitude.glade:1490
+#: src/gtk/aptitude.glade:1809 src/gtk/aptitude.glade:1945
+msgid "Search:"
+msgstr ""
+
+#: src/gtk/aptitude.glade:831 src/gtk/aptitude.glade:1510
+#: src/gtk/aptitude.glade:1829 src/gtk/aptitude.glade:1965
+msgid "gtk-find"
 msgstr ""
 
-#: src/gtk/aptitude.glade:803 src/gtk/aptitude.glade:1473
-#: src/gtk/aptitude.glade:1610
+#: src/gtk/aptitude.glade:845
+msgid "Incremental"
+msgstr ""
+
+#: src/gtk/aptitude.glade:862 src/gtk/aptitude.glade:1528
+#: src/gtk/aptitude.glade:1847 src/gtk/aptitude.glade:1983
+#, fuzzy
+#| msgid "Err "
+msgid "Errors"
+msgstr "ปัญหา "
+
+#: src/gtk/aptitude.glade:879 src/gtk/aptitude.glade:1864
+#: src/gtk/aptitude.glade:2000
 msgid "Show "
 msgstr ""
 
-#: src/gtk/aptitude.glade:949
+#: src/gtk/aptitude.glade:986
 msgid "<span size=\"xx-large\">Versions:</span>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1011
+#: src/gtk/aptitude.glade:1046
 #, fuzzy
 #| msgid "Depends"
 msgid "Dependencies"
 msgstr "ต้องใช้"
 
-#: src/gtk/aptitude.glade:1041
+#: src/gtk/aptitude.glade:1076
 msgid "Changelog"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1070
+#: src/gtk/aptitude.glade:1104
 msgid "Files"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1081
+#: src/gtk/aptitude.glade:1115
 msgid "popcon"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1090
+#: src/gtk/aptitude.glade:1124
 msgid "Popcon"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1101
+#: src/gtk/aptitude.glade:1135
 msgid "tags"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1132 src/gtk/info.cc:727
-msgid "Info"
+#: src/gtk/aptitude.glade:1192
+msgid "Fixing upgrade manually:"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1219
+#: src/gtk/aptitude.glade:1202 src/gtk/dashboardtab.cc:536
+msgid "Calculating upgrade..."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1229
 msgid ""
 "Arrange the actions of the current solution so that actions that are of the "
 "same type are placed together (for instance, all the actions that remove "
@@ -3030,124 +3137,127 @@ msgid ""
 "This is the default view mode."
 msgstr ""
 
-#: src/gtk/aptitude.glade:1222
+#: src/gtk/aptitude.glade:1232
 msgid "Group by action type"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1235
+#: src/gtk/aptitude.glade:1245
 msgid ""
 "Show the order in which the actions in the current solution were performed "
 "and the dependency that triggered each action."
 msgstr ""
 
-#: src/gtk/aptitude.glade:1236
+#: src/gtk/aptitude.glade:1246
 msgid "Show an explanation of the solution"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1253
+#: src/gtk/aptitude.glade:1263
 msgid "<b>View Mode</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1290 src/gtk/download.cc:203
-#: src/gtk/entityview.cc:551
-msgid "Status"
+#: src/gtk/aptitude.glade:1307
+msgid "Rejected"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1299
-msgid "gtk-go-back"
+#: src/gtk/aptitude.glade:1317
+msgid "No preference"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1314
-msgid "gtk-go-forward"
+#: src/gtk/aptitude.glade:1331
+msgid "Accepted"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1329
-msgid "gtk-apply"
+#: src/gtk/aptitude.glade:1347
+msgid "<b>Status of selected action</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1521
-msgid "<b>Start at these packages:</b>"
+#: src/gtk/aptitude.glade:1364 src/gtk/download.cc:261
+#: src/gtk/entityview.cc:551
+msgid "Status"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1658
-msgid "<b>End at these packages:</b>"
+#: src/gtk/aptitude.glade:1415
+msgid "<b>Solutions</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1705
-msgid "Dependency Chain"
+#: src/gtk/aptitude.glade:1442
+msgid "Calculate the next solution that has not yet been generated."
 msgstr ""
 
-#: src/gtk/aptitude.glade:1723
-msgid "A terminal running dpkg will appear here."
+#: src/gtk/aptitude.glade:1443
+msgid "Find a new solution"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1734
-msgid "Applying Changes"
+#: src/gtk/aptitude.glade:1457
+msgid ""
+"Perform the actions in the currently selected solution and close this tab."
 msgstr ""
 
-#: src/gtk/aptitude.glade:1747
-msgid ""
-"Placeholder label for the explanation that two conffiles are being "
-"compared.\n"
-"This text should not appear in the program."
+#: src/gtk/aptitude.glade:1458
+msgid "gtk-apply"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1773
-msgid "View the differences\t"
+#: src/gtk/aptitude.glade:1607
+msgid "Upgrade Summary"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1799
-msgid ""
-"Do you want to apply these changes?\n"
-"You can also modify the files by hand, then click \"No\"."
+#: src/gtk/aptitude.glade:1636
+msgid "Selected Package"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1811
-msgid "gtk-yes"
+#: src/gtk/aptitude.glade:1667
+msgid ""
+"Label explaining the upgrade.  This text will not appear in the program at "
+"runtime."
 msgstr ""
 
-#: src/gtk/aptitude.glade:1821
-msgid "gtk-no"
+#: src/gtk/aptitude.glade:1682
+msgid "Fix Manually"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1847
-msgid "Conffile Diff"
+#: src/gtk/aptitude.glade:1691 src/gtk/gui.cc:91 src/gtk/gui.cc:1356
+msgid "Upgrade"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1919 src/gtk/gui.cc:88 src/gtk/gui.cc:1151
-msgid "Remove"
+#: src/gtk/aptitude.glade:1718
+msgid "<b>Available Upgrades:</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1932 src/gtk/gui.cc:1156
-msgid "Purge"
+#: src/gtk/aptitude.glade:1911
+msgid "<b>Start at these packages:</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1945 src/gtk/gui.cc:1161
-msgid "Keep"
+#: src/gtk/aptitude.glade:2047
+msgid "<b>End at these packages:</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1958 src/gtk/gui.cc:1166
-msgid "Hold"
+#: src/gtk/aptitude.glade:2115
+msgid "A terminal running dpkg will appear here."
 msgstr ""
 
-#: src/gtk/aptitude.glade:1971
-msgid "Edit Columns..."
+#: src/gtk/aptitude.glade:2127
+msgid ""
+"Placeholder label for the explanation that two conffiles are being "
+"compared.\n"
+"This text should not appear in the program."
 msgstr ""
 
-#: src/gtk/aptitude.glade:1984
-msgid "Dummy label (will be replaced at runtime)."
+#: src/gtk/aptitude.glade:2153
+msgid "View the differences\t"
 msgstr ""
 
-#: src/gtk/aptitude.glade:2016
-msgid "Make this the default for new package lists."
+#: src/gtk/aptitude.glade:2179
+msgid ""
+"Do you want to apply these changes?\n"
+"You can also modify the files by hand, then click \"No\"."
 msgstr ""
 
-#: src/gtk/aptitude.glade:2032
-msgid "Apply these settings to all active package lists."
+#: src/gtk/aptitude.glade:2191
+msgid "gtk-yes"
 msgstr ""
 
-#: src/gtk/aptitude.glade:2050
-msgid "gtk-close"
+#: src/gtk/aptitude.glade:2201
+msgid "gtk-no"
 msgstr ""
 
 #: src/gtk/changelog.cc:276
@@ -3166,49 +3276,97 @@ msgid ""
 "package."
 msgstr ""
 
-#: src/gtk/changelog.cc:376
+#: src/gtk/changelog.cc:373
 #, fuzzy, c-format
 #| msgid "Unable to locate package %s"
 msgid "Failed to download the changelog: %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: src/gtk/changelog.cc:445
+#: src/gtk/changelog.cc:479
 #, c-format
 msgid ""
 "You can only view changelogs of official Debian packages; the origin of %s "
 "is unknown."
 msgstr ""
 
-#: src/gtk/changelog.cc:449
+#: src/gtk/changelog.cc:483
 #, c-format
 msgid ""
 "You can only view changelogs of official Debian packages; %s is from %s."
 msgstr ""
 
-#: src/gtk/changelog.cc:469
+#: src/gtk/changelog.cc:503
 msgid "Downloading changelog; please wait..."
 msgstr ""
 
-#: src/gtk/changelog.cc:528
+#: src/gtk/changelog.cc:563
 msgid "Downloading changelogs"
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:99
+#: src/gtk/dashboardtab.cc:210
+msgid "Resolve Upgrade Manually"
+msgstr ""
+
+#: src/gtk/dashboardtab.cc:306
 msgid "Preparing to download changelogs"
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:185
+#: src/gtk/dashboardtab.cc:396
 msgid "Available upgrades:"
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:195
+#: src/gtk/dashboardtab.cc:413
 #, c-format
 msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/dashboardtab.cc:302
+#: src/gtk/dashboardtab.cc:629
+msgid "No upgrades are available."
+msgstr ""
+
+#: src/gtk/dashboardtab.cc:641
+#, fuzzy
+#| msgid "Unable to locate package %s"
+msgid "Unable to calculate an upgrade."
+msgstr "ไม่พบแพกเกจ %s"
+
+#: src/gtk/dashboardtab.cc:650
+#, c-format
+msgid ""
+"Press \"%s\" to install <span size='large'>%d</span> upgrade out of <span "
+"size='large'>%d</span>."
+msgid_plural ""
+"Press \"%s\" to install <span size='large'>%d</span> upgrades out of <span "
+"size='large'>%d</span>."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/dashboardtab.cc:662
+#, c-format
+msgid ""
+"Press \"%s\" to manually attempt to install the remaining <span size='large'>"
+"%d</span> upgrade."
+msgid_plural ""
+"Press \"%s\" to manually attempt to install the remaining <span size='large'>"
+"%d</span> upgrades."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/dashboardtab.cc:687
+#, c-format
+msgid ""
+"Unable to calculate an upgrade.  Press \"%s\" to manually search for a "
+"solution."
+msgstr ""
+
+#: src/gtk/dashboardtab.cc:704
+#, c-format
+msgid "Internal error encountered while calculating an upgrade: %s"
+msgstr ""
+
+#: src/gtk/dashboardtab.cc:836
 #, c-format
 msgid ""
 "The package %s has no candidate version and will not be upgraded; unable to "
@@ -3227,128 +3385,130 @@ msgstr ""
 msgid "Find dependency chains: results"
 msgstr ""
 
-#: src/gtk/dependency_chains_tab.cc:220
+#: src/gtk/dependency_chains_tab.cc:221
 msgid "Select one or more starting packages and an ending package to search."
 msgstr ""
 
-#: src/gtk/dependency_chains_tab.cc:275
+#: src/gtk/dependency_chains_tab.cc:276
 msgid "No dependency chain found."
 msgstr ""
 
-#: src/gtk/download.cc:129
+#: src/gtk/download.cc:179
 msgid "Ignored"
 msgstr ""
 
-#: src/gtk/download.cc:136
+#: src/gtk/download.cc:185
 msgid "Failed"
 msgstr ""
 
-#: src/gtk/download.cc:145
+#: src/gtk/download.cc:193
 msgid "Already downloaded"
 msgstr ""
 
-#: src/gtk/download.cc:152
-msgid "Fetch"
-msgstr ""
-
-#: src/gtk/download.cc:158
+#: src/gtk/download.cc:204
 msgid "Done"
 msgstr ""
 
-#: src/gtk/download.cc:202
-msgid "URI"
+#: src/gtk/download.cc:248 src/gtk/entityview.cc:397 src/pkg_columnizer.cc:93
+#: src/pkg_view.cc:672
+msgid "Description"
 msgstr ""
 
-#: src/gtk/download.cc:208
+#: src/gtk/download.cc:253
 msgid "Progress"
 msgstr ""
 
-#: src/gtk/download.cc:216
+#: src/gtk/download.cc:264
 msgid "Short Description"
 msgstr ""
 
-#: src/gtk/download.cc:217 src/gtk/entityview.cc:397 src/pkg_columnizer.cc:93
-#: src/pkg_view.cc:671
-msgid "Description"
+#: src/gtk/download.cc:272
+msgid "URI"
 msgstr ""
 
-#: src/gtk/download.cc:264
+#: src/gtk/download.cc:319
 msgid "The download is still in progress.  Should it be canceled?"
 msgstr ""
 
-#: src/gtk/download.cc:340 src/gtk/gui.cc:568
+#: src/gtk/download.cc:395 src/gtk/gui.cc:776
 msgid "View Details"
 msgstr ""
 
-#: src/gtk/download.cc:384
+#: src/gtk/download.cc:439
 msgid "Change media"
 msgstr ""
 
-#: src/gtk/download.cc:405
+#: src/gtk/download.cc:460
 #, c-format
 msgid "%s: %sB/s"
 msgstr ""
 
-#: src/gtk/download.cc:425
+#: src/gtk/download.cc:480
 #, c-format
 msgid "%s: %lu/%lu, %sB/s"
 msgstr ""
 
-#: src/gtk/download.cc:431
+#: src/gtk/download.cc:486
 #, c-format
 msgid "%s: %lu/%lu, stalled"
 msgstr ""
 
-#: src/gtk/download.cc:452
+#: src/gtk/download.cc:507
 #, c-format
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr ""
 
-#: src/gtk/download.cc:459
+#: src/gtk/download.cc:514
 #, c-format
 msgid "%s: %sB of %sB, stalled"
 msgstr ""
 
-#: src/gtk/download.cc:488
+#: src/gtk/download.cc:541
 msgid "Completed"
 msgstr ""
 
-#: src/gtk/download.cc:490
+#: src/gtk/download.cc:543
 msgid "Completed with errors"
 msgstr ""
 
-#: src/gtk/dpkg_terminal.cc:142
+#: src/gtk/dpkg_terminal.cc:352
 #, fuzzy, c-format
 #| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: src/gtk/dpkg_terminal.cc:307
+#: src/gtk/dpkg_terminal.cc:388 src/gtk/dpkg_terminal.cc:466
+#, c-format
+msgid "Internal error: the temporary socket name \"%s\" is too long!"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:429
+#, fuzzy, c-format
+#| msgid "Unable to locate package %s"
+msgid "%s: Unable to accept a connection: %s"
+msgstr "ไม่พบแพกเกจ %s"
+
+#: src/gtk/dpkg_terminal.cc:533
 #, c-format
 msgid "[%s] dpkg process starting...\n"
 msgstr ""
 
-#: src/gtk/dpkg_terminal.cc:342
+#: src/gtk/dpkg_terminal.cc:566
 #, c-format
 msgid "[%s] dpkg process complete.\n"
 msgstr ""
 
-#: src/gtk/dpkg_terminal.cc:345
+#: src/gtk/dpkg_terminal.cc:569
 #, c-format
 msgid "[%s] dpkg process failed.\n"
 msgstr ""
 
-#: src/gtk/dpkg_terminal.cc:348
+#: src/gtk/dpkg_terminal.cc:572
 #, c-format
 msgid "[%s] dpkg process complete; there are more packages left to process.\n"
 msgstr ""
 
-#: src/gtk/dpkg_terminal.cc:366
-#, c-format
-msgid "%s: Unable to accept a connection from the subprocess: %s"
-msgstr ""
-
-#: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575 src/gtk/resolver.cc:159
+#: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575
 msgid "Name"
 msgstr ""
 
@@ -3405,99 +3565,99 @@ msgstr ""
 msgid "Files list is only available for installed packages."
 msgstr ""
 
-#: src/gtk/gui.cc:73
+#: src/gtk/gui.cc:78
 #, fuzzy
 #| msgid "%lu reinstalled, "
 msgid "Not installed"
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: src/gtk/gui.cc:74
+#: src/gtk/gui.cc:79
 msgid "Virtual"
 msgstr ""
 
-#: src/gtk/gui.cc:75
+#: src/gtk/gui.cc:80
 msgid "Unpacked"
 msgstr ""
 
-#: src/gtk/gui.cc:76
+#: src/gtk/gui.cc:81
 msgid "Half-configured"
 msgstr ""
 
-#: src/gtk/gui.cc:77
+#: src/gtk/gui.cc:82
 #, fuzzy
 #| msgid "%lu reinstalled, "
 msgid "Half-installed"
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: src/gtk/gui.cc:78
+#: src/gtk/gui.cc:83
 msgid "Configuration files and data remain"
 msgstr ""
 
-#: src/gtk/gui.cc:79
+#: src/gtk/gui.cc:84
 msgid "Triggers awaited"
 msgstr ""
 
-#: src/gtk/gui.cc:80
+#: src/gtk/gui.cc:85
 msgid "Triggers pending"
 msgstr ""
 
-#: src/gtk/gui.cc:81
+#: src/gtk/gui.cc:86
 msgid "Installed"
 msgstr ""
 
-#: src/gtk/gui.cc:85
+#: src/gtk/gui.cc:90
 msgid "Reinstall"
 msgstr ""
 
-#: src/gtk/gui.cc:87 src/gtk/gui.cc:1141
+#: src/gtk/gui.cc:92 src/gtk/gui.cc:1362
 msgid "Downgrade"
 msgstr ""
 
-#: src/gtk/gui.cc:89
+#: src/gtk/gui.cc:94
 msgid "Remove and purge configuration/data"
 msgstr ""
 
-#: src/gtk/gui.cc:90
+#: src/gtk/gui.cc:95
 msgid "Hold (don't upgrade)"
 msgstr ""
 
-#: src/gtk/gui.cc:92
+#: src/gtk/gui.cc:97
 msgid "Unsatisfied dependencies"
 msgstr ""
 
-#: src/gtk/gui.cc:203
+#: src/gtk/gui.cc:213
 msgid "Checking for updates"
 msgstr ""
 
-#: src/gtk/gui.cc:219
+#: src/gtk/gui.cc:231
 msgid "Insufficient privileges."
 msgstr ""
 
-#: src/gtk/gui.cc:222
+#: src/gtk/gui.cc:234
 msgid "You must be root to update the package lists."
 msgstr ""
 
-#: src/gtk/gui.cc:230 src/gtk/gui.cc:670
+#: src/gtk/gui.cc:242 src/gtk/gui.cc:890
 msgid "Download already running."
 msgstr ""
 
-#: src/gtk/gui.cc:232 src/gtk/gui.cc:672 src/ui.cc:1462 src/ui.cc:1695
+#: src/gtk/gui.cc:244 src/gtk/gui.cc:892 src/ui.cc:1462 src/ui.cc:1696
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
-#: src/gtk/gui.cc:291
+#: src/gtk/gui.cc:303
 #, c-format
 msgid "Update %s?"
 msgstr ""
 
-#: src/gtk/gui.cc:317
+#: src/gtk/gui.cc:329
 #, c-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: src/gtk/gui.cc:321
+#: src/gtk/gui.cc:333
 #, c-format
 msgid ""
 "The configuration file %s was modified (by you or by a script). An updated "
@@ -3506,75 +3666,75 @@ msgid ""
 "the new package maintainers version? "
 msgstr ""
 
-#: src/gtk/gui.cc:349
+#: src/gtk/gui.cc:361
 #, c-format
 msgid "Comparing %s to %s..."
 msgstr ""
 
-#: src/gtk/gui.cc:508
+#: src/gtk/gui.cc:682
 msgid ""
 "Interrupting this process could leave your system in an inconsistent state.  "
 "Are you sure you want to stop applying your changes?"
 msgstr ""
 
-#: src/gtk/gui.cc:532
+#: src/gtk/gui.cc:720
 msgid "Done applying changes!"
 msgstr ""
 
-#: src/gtk/gui.cc:560
+#: src/gtk/gui.cc:767
 msgid "Applying changes..."
 msgstr ""
 
-#: src/gtk/gui.cc:602
+#: src/gtk/gui.cc:819
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: src/gtk/gui.cc:605
+#: src/gtk/gui.cc:822
 #, c-format
 msgid "Error in package %s"
 msgstr ""
 
-#: src/gtk/gui.cc:633
+#: src/gtk/gui.cc:850
 #, c-format
 msgid "Asking whether to replace the configuration file %s"
 msgstr ""
 
-#: src/gtk/gui.cc:686 src/ui.cc:1206
+#: src/gtk/gui.cc:906 src/ui.cc:1206
 msgid "Downloading packages"
 msgstr ""
 
-#: src/gtk/gui.cc:760
+#: src/gtk/gui.cc:982
 msgid "Broken packages"
 msgstr ""
 
-#: src/gtk/gui.cc:793
+#: src/gtk/gui.cc:1015
 msgid "Show broken packages"
 msgstr ""
 
-#: src/gtk/gui.cc:797
+#: src/gtk/gui.cc:1019
 msgid "Resolve dependencies"
 msgstr ""
 
-#: src/gtk/gui.cc:825
+#: src/gtk/gui.cc:1047
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/gui.cc:869
+#: src/gtk/gui.cc:1091
 msgid "View changes"
 msgstr ""
 
-#: src/gtk/gui.cc:873
+#: src/gtk/gui.cc:1095
 msgid "Apply changes"
 msgstr ""
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:912
+#: src/gtk/gui.cc:1136
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -3584,59 +3744,59 @@ msgstr[1] ""
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:927
+#: src/gtk/gui.cc:1151
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/gui.cc:966
+#: src/gtk/gui.cc:1190
 #, c-format
 msgid "Download size: %sB."
 msgstr ""
 
-#: src/gtk/gui.cc:1016
+#: src/gtk/gui.cc:1232
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1078
+#: src/gtk/gui.cc:1293
+msgid "This feature is not implemented, yet."
+msgstr ""
+
+#: src/gtk/gui.cc:1299
 #, fuzzy
 #| msgid "%lu reinstalled, "
 msgid "Not implemented"
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: src/gtk/gui.cc:1081
-msgid "This feature is not implemented, yet."
-msgstr ""
-
-#: src/gtk/gui.cc:1130 src/gtk/gui.cc:1149
+#: src/gtk/gui.cc:1351 src/gtk/gui.cc:1370
 msgid "Install/Upgrade"
 msgstr ""
 
-#: src/gtk/gui.cc:1172
+#: src/gtk/gui.cc:1393
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1177
+#: src/gtk/gui.cc:1398
 msgid "Set as manual"
 msgstr ""
 
-#: src/gtk/gui.cc:1182
+#: src/gtk/gui.cc:1403
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1490
+#: src/gtk/gui.cc:1723
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
 
-#: src/gtk/info.cc:160 src/gtk/pkgview.cc:166
+#: src/gtk/info.cc:160 src/gtk/pkgview.cc:169
 msgid "Current status"
 msgstr ""
 
-#: src/gtk/info.cc:162 src/gtk/pkgview.cc:168
+#: src/gtk/info.cc:162 src/gtk/pkgview.cc:171
 msgid "Selected status"
 msgstr ""
 
@@ -3656,6 +3816,10 @@ msgstr ""
 msgid "Please wait; reloading cache..."
 msgstr ""
 
+#: src/gtk/info.cc:737
+msgid "Info"
+msgstr ""
+
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:353 src/pkg_columnizer.cc:374
 #: src/pkg_columnizer.cc:381 src/pkg_grouppolicy.cc:270
@@ -3668,144 +3832,152 @@ msgstr ""
 msgid "Parse error"
 msgstr ""
 
-#: src/gtk/packagestab.cc:148
+#: src/gtk/packagestab.cc:203
 #, c-format
 msgid "No packages matched \"%s\"."
 msgstr ""
 
-#: src/gtk/packagestab.cc:258
+#: src/gtk/packagestab.cc:313
 msgid "Enter a search and click \"Find\" to display packages."
 msgstr ""
 
-#: src/gtk/packagestab.cc:356
+#: src/gtk/packagestab.cc:413
 msgid "Packages: "
 msgstr ""
 
-#: src/gtk/packagestab.cc:433
+#: src/gtk/packagestab.cc:490
 #, c-format
 msgid "Upgrade to %s version %s"
 msgstr ""
 
-#: src/gtk/packagestab.cc:441
+#: src/gtk/packagestab.cc:498
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
 msgid "Install %s version %s"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
-#: src/gtk/packagestab.cc:449
+#: src/gtk/packagestab.cc:506
 #, c-format
 msgid "Downgrade to %s version %s"
 msgstr ""
 
-#: src/gtk/packagestab.cc:460
+#: src/gtk/packagestab.cc:517
 #, c-format
 msgid "Don't hold %s at its current version."
 msgstr ""
 
-#: src/gtk/packagestab.cc:463 src/gtk/packagestab.cc:483
-#: src/gtk/packagestab.cc:486
+#: src/gtk/packagestab.cc:520 src/gtk/packagestab.cc:540
+#: src/gtk/packagestab.cc:543
 #, c-format
 msgid "Cancel any actions on %s."
 msgstr ""
 
-#: src/gtk/packagestab.cc:468
+#: src/gtk/packagestab.cc:525
 #, c-format
 msgid "Cancel the purge of %s."
 msgstr ""
 
-#: src/gtk/packagestab.cc:470
+#: src/gtk/packagestab.cc:527
 #, c-format
 msgid "Cancel the removal of %s."
 msgstr ""
 
-#: src/gtk/packagestab.cc:475
+#: src/gtk/packagestab.cc:532
 #, c-format
 msgid "Cancel the upgrade of %s."
 msgstr ""
 
-#: src/gtk/packagestab.cc:477
+#: src/gtk/packagestab.cc:534
 #, c-format
 msgid "Cancel the installation of %s."
 msgstr ""
 
-#: src/gtk/packagestab.cc:479
+#: src/gtk/packagestab.cc:536
 #, c-format
 msgid "Cancel the downgrade of %s."
 msgstr ""
 
-#: src/gtk/packagestab.cc:481
+#: src/gtk/packagestab.cc:538
 #, c-format
 msgid "Cancel the reinstallation of %s."
 msgstr ""
 
-#: src/gtk/packagestab.cc:522
+#: src/gtk/packagestab.cc:579
 #, fuzzy, c-format
 #| msgid "Removing %s"
 msgid "Remove %s"
 msgstr "กำลังถอดถอน %s"
 
-#: src/gtk/packagestab.cc:526
+#: src/gtk/packagestab.cc:583
 #, c-format
 msgid "Purge %s"
 msgstr ""
 
-#: src/gtk/packagestab.cc:534
+#: src/gtk/packagestab.cc:591
 #, c-format
 msgid "Hold %s at its current version."
 msgstr ""
 
-#: src/gtk/packagestab.cc:539
+#: src/gtk/packagestab.cc:596
 #, c-format
 msgid "Mark %s as automatically installed."
 msgstr ""
 
-#: src/gtk/packagestab.cc:544
+#: src/gtk/packagestab.cc:601
 #, c-format
 msgid "Mark %s as manually installed."
 msgstr ""
 
-#: src/gtk/packagestab.cc:586
+#: src/gtk/packagestab.cc:643
 #, c-format
 msgid "%s is a virtual package provided by:\n"
 msgstr ""
 
-#: src/gtk/packagestab.cc:650 src/gtk/previewtab.cc:210
+#: src/gtk/packagestab.cc:707 src/gtk/previewtab.cc:210
 msgid "(more info...)"
 msgstr ""
 
-#: src/gtk/pkgview.cc:221
+#: src/gtk/packagestab.cc:736
+msgid "Source: "
+msgstr ""
+
+#: src/gtk/pkgview.cc:224
 #, c-format
 msgid "%s was installed automatically."
 msgstr ""
 
-#: src/gtk/pkgview.cc:224
+#: src/gtk/pkgview.cc:227
 #, c-format
 msgid "%s is being installed automatically."
 msgstr ""
 
-#: src/gtk/pkgview.cc:232
+#: src/gtk/pkgview.cc:235
 #, c-format
 msgid "%s was installed manually."
 msgstr ""
 
-#: src/gtk/pkgview.cc:235
+#: src/gtk/pkgview.cc:238
 #, c-format
 msgid "%s is being installed manually."
 msgstr ""
 
-#: src/gtk/pkgview.cc:390
+#: src/gtk/pkgview.cc:399
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:422 src/gtk/pkgview.cc:438 src/pkg_tree.cc:204
-#: src/pkg_tree.cc:215 src/pkg_tree.cc:226 src/pkg_tree.cc:238
-msgid "Building view"
+#: src/gtk/pkgview.cc:604
+msgid "Searching..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:428 src/gtk/pkgview.cc:444
+#: src/gtk/pkgview.cc:715
 msgid "Finalizing view"
 msgstr ""
 
+#: src/gtk/pkgview.cc:715 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/pkg_tree.cc:226 src/pkg_tree.cc:238
+msgid "Building view"
+msgstr ""
+
 #: src/gtk/previewtab.cc:96 src/pkg_grouppolicy.cc:637
 msgid ""
 "Packages with unsatisfied dependencies\n"
@@ -3895,12 +4067,12 @@ msgstr ""
 msgid "Preview: "
 msgstr ""
 
-#: src/gtk/resolver.cc:58
+#: src/gtk/resolver.cc:68
 #, c-format
 msgid "Error in dependency resolver: %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:61
+#: src/gtk/resolver.cc:71
 #, c-format
 msgid ""
 "Fatal error in dependency resolver.  You can continue searching, but some "
@@ -3909,151 +4081,377 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/gtk/resolver.cc:160 src/pkg_columnizer.cc:92
-msgid "Action"
+#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275
+msgid "Not Installed"
+msgstr ""
+
+#: src/gtk/resolver.cc:332
+#, fuzzy, c-format
+#| msgid "Removing %s"
+msgid "Removing %s is rejected."
+msgstr "กำลังถอดถอน %s"
+
+#: src/gtk/resolver.cc:337
+#, c-format
+msgid "Canceling the installation of %s is rejected."
+msgstr ""
+
+#: src/gtk/resolver.cc:347
+#, c-format
+msgid "Canceling the removal of %s is rejected."
+msgstr ""
+
+#: src/gtk/resolver.cc:350
+#, fuzzy, c-format
+#| msgid "Fetched %sB in %s (%sB/s)\n"
+msgid "Keeping %s at version %s is rejected."
+msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
+
+#: src/gtk/resolver.cc:357
+#, fuzzy, c-format
+#| msgid "Invalid operation %s"
+msgid "Installing %s version %s is rejected."
+msgstr "ไม่รู้จักคำสั่ง %s"
+
+#: src/gtk/resolver.cc:363
+#, c-format
+msgid "Downgrading %s to version %s is rejected."
+msgstr ""
+
+#: src/gtk/resolver.cc:369
+#, c-format
+msgid "Upgrading %s to version %s is rejected."
+msgstr ""
+
+#: src/gtk/resolver.cc:386
+#, c-format
+msgid "Removing %s is preferred over all un-accepted alternatives."
+msgstr ""
+
+#: src/gtk/resolver.cc:391
+#, c-format
+msgid ""
+"Canceling the installation of %s is preferred over all un-accepted "
+"alternatives."
+msgstr ""
+
+#: src/gtk/resolver.cc:401
+#, c-format
+msgid ""
+"Canceling the removal of %s is preferred over all un-accepted alternatives."
+msgstr ""
+
+#: src/gtk/resolver.cc:404
+#, c-format
+msgid ""
+"Keeping %s at version %s is preferred over all un-accepted alternatives."
+msgstr ""
+
+#: src/gtk/resolver.cc:411
+#, c-format
+msgid ""
+"Installing %s version %s is preferred over all un-accepted alternatives."
+msgstr ""
+
+#: src/gtk/resolver.cc:417
+#, c-format
+msgid ""
+"Downgrading %s to version %s is preferred over all un-accepted alternatives."
 msgstr ""
 
-#: src/gtk/resolver.cc:266 src/solution_fragment.cc:106
+#: src/gtk/resolver.cc:423
+#, c-format
+msgid ""
+"Upgrading %s to version %s is preferred over all un-accpted alternatives."
+msgstr ""
+
+#: src/gtk/resolver.cc:441
+#, c-format
+msgid "Leaving %ls unresolved is rejected."
+msgstr ""
+
+#: src/gtk/resolver.cc:447
+#, c-format
+msgid "Leaving %ls unresolved is preferred over all un-accepted alternatives."
+msgstr ""
+
+#: src/gtk/resolver.cc:851
+msgid "How to treat the selected action"
+msgid_plural "How to treat the selected actions"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/resolver.cc:855
+msgid "Ignore solutions containing this action."
+msgid_plural "Ignore solutions containing these actions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/resolver.cc:859
+msgid ""
+"Allow solutions containing this action, but do not prefer them to other "
+"solutions."
+msgid_plural ""
+"Allow solutions containing these actions, but do not prefer them to other "
+"solutions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/resolver.cc:863
+msgid ""
+"Always prefer this action over alternatives that have not been accepted."
+msgid_plural ""
+"Always prefer these actions over alternatives that have not been accepted."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/resolver.cc:1133 src/solution_fragment.cc:108
 #, c-format
 msgid "%s depends upon %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:269 src/solution_fragment.cc:109
+#: src/gtk/resolver.cc:1136 src/solution_fragment.cc:111
 #, c-format
 msgid "%s pre-depends upon %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:272 src/solution_fragment.cc:112
+#: src/gtk/resolver.cc:1139 src/solution_fragment.cc:114
 #, c-format
 msgid "%s suggests %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:275 src/solution_fragment.cc:115
-#: src/solution_item.cc:602
+#: src/gtk/resolver.cc:1142 src/solution_fragment.cc:117
+#: src/solution_item.cc:603
 #, c-format
 msgid "%s recommends %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:278 src/solution_fragment.cc:118
+#: src/gtk/resolver.cc:1145 src/solution_fragment.cc:120
 #, c-format
 msgid "%s conflicts with %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:281 src/solution_fragment.cc:121
+#: src/gtk/resolver.cc:1148 src/solution_fragment.cc:123
 #, c-format
 msgid "%s breaks %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:284 src/solution_fragment.cc:124
+#: src/gtk/resolver.cc:1151 src/solution_fragment.cc:126
 #, c-format
 msgid "%s replaces %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:287 src/solution_fragment.cc:127
+#: src/gtk/resolver.cc:1154 src/solution_fragment.cc:129
 #, c-format
 msgid "%s obsoletes %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:367 src/solution_screen.cc:248
+#: src/gtk/resolver.cc:1264 src/gtk/resolver.cc:1718
+#: src/solution_screen.cc:271
 msgid "Remove the following packages:"
 msgstr ""
 
-#: src/gtk/resolver.cc:382 src/solution_screen.cc:270
+#: src/gtk/resolver.cc:1278 src/gtk/resolver.cc:1730
+#: src/solution_screen.cc:295
 msgid "Install the following packages:"
 msgstr ""
 
-#: src/gtk/resolver.cc:399
+#: src/gtk/resolver.cc:1291 src/gtk/resolver.cc:1742
 #, fuzzy
 #| msgid "The following packages will be REMOVED:"
 msgid "Keep the following packages:"
 msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
 
-#: src/gtk/resolver.cc:409 src/solution_fragment.cc:251
-msgid "Not Installed"
-msgstr ""
-
-#: src/gtk/resolver.cc:425 src/solution_screen.cc:281
+#: src/gtk/resolver.cc:1304 src/gtk/resolver.cc:1754
+#: src/solution_screen.cc:307
 msgid "Upgrade the following packages:"
 msgstr ""
 
-#: src/gtk/resolver.cc:444 src/solution_screen.cc:292
+#: src/gtk/resolver.cc:1317 src/gtk/resolver.cc:1767
+#: src/solution_screen.cc:319
 msgid "Downgrade the following packages:"
 msgstr ""
 
-#: src/gtk/resolver.cc:465
+#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1780
 msgid "Leave the following dependencies unresolved:"
 msgstr ""
 
-#: src/gtk/resolver.cc:523
+#: src/gtk/resolver.cc:1405
 #, fuzzy, c-format
 #| msgid "Removing %s"
-msgid "Remove %s [%s (%s)]"
+msgid "Remove %s [<big>%s</big> (%s)]"
 msgstr "กำลังถอดถอน %s"
 
-#: src/gtk/resolver.cc:530
+#: src/gtk/resolver.cc:1412
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Install %s [%s (%s)]"
+msgid "Install %s [<big>%s</big> (%s)]"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
-#: src/gtk/resolver.cc:538
+#: src/gtk/resolver.cc:1420
 #, c-format
 msgid "Cancel the installation of %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:541
+#: src/gtk/resolver.cc:1423
 #, c-format
 msgid "Cancel the removal of %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:544
+#: src/gtk/resolver.cc:1426
 #, fuzzy, c-format
 #| msgid "Fetched %sB in %s (%sB/s)\n"
-msgid "Keep %s at version %s (%s)"
+msgid "Keep %s at version <big>%s</big> (%s)"
 msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
 
-#: src/gtk/resolver.cc:551
+#: src/gtk/resolver.cc:1433
 #, c-format
-msgid "Upgrade %s [%s (%s) -> %s (%s)]"
+msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr ""
 
-#: src/gtk/resolver.cc:560
+#: src/gtk/resolver.cc:1442
 #, c-format
-msgid "Downgrade %s [%s (%s) -> %s (%s)]"
+msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]"
 msgstr ""
 
-#: src/gtk/resolver.cc:589
-msgid "Nothing to do: there are no broken packages."
+#: src/gtk/resolver.cc:1499
+#, fuzzy, c-format
+#| msgid "Removing %s"
+msgid "<b>Remove</b> %s"
+msgstr "กำลังถอดถอน %s"
+
+#: src/gtk/resolver.cc:1499
+#, fuzzy, c-format
+#| msgid "Removing %s"
+msgid "<b>remove</b> %s"
+msgstr "กำลังถอดถอน %s"
+
+#: src/gtk/resolver.cc:1507
+#, fuzzy, c-format
+#| msgid "Fetched %sB in %s (%sB/s)\n"
+msgid "<b>Keep</b> %s at version %s"
+msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
+
+#: src/gtk/resolver.cc:1507
+#, fuzzy, c-format
+#| msgid "Fetched %sB in %s (%sB/s)\n"
+msgid "<b>keep</b> %s at version %s"
+msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
+
+#: src/gtk/resolver.cc:1516
+#, fuzzy, c-format
+#| msgid "Invalid operation %s"
+msgid "<b>Install</b> %s %s"
+msgstr "ไม่รู้จักคำสั่ง %s"
+
+#: src/gtk/resolver.cc:1516
+#, fuzzy, c-format
+#| msgid "Invalid operation %s"
+msgid "<b>install</b> %s %s"
+msgstr "ไม่รู้จักคำสั่ง %s"
+
+#: src/gtk/resolver.cc:1525
+#, c-format
+msgid "<b>Downgrade</b> %s to version %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:596
-msgid "No resolutions found."
+#: src/gtk/resolver.cc:1525
+#, c-format
+msgid "<b>downgrade</b> %s to version %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:611 src/solution_screen.cc:515
+#: src/gtk/resolver.cc:1534
 #, c-format
-msgid "open: %d; closed: %d; defer: %d; conflict: %d"
+msgid "<b>Upgrade</b> %s to version %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:650
-msgid "No solutions."
+#: src/gtk/resolver.cc:1534
+#, c-format
+msgid "<b>upgrade</b> %s to version %s"
 msgstr ""
 
-#: src/gtk/resolver.cc:650
+#: src/gtk/resolver.cc:1547
+#, c-format
+msgid "Leave %s unresolved"
+msgstr ""
+
+#: src/gtk/resolver.cc:1547
+#, c-format
+msgid "leave %s unresolved"
+msgstr ""
+
+#: src/gtk/resolver.cc:1615
+#, fuzzy, c-format
+#| msgid "%lu reinstalled, "
+msgid "%s install"
+msgid_plural "%s installs"
+msgstr[0] "ติดตั้งซ้ำ %lu, "
+msgstr[1] "ติดตั้งซ้ำ %lu, "
+
+#: src/gtk/resolver.cc:1620
+#, c-format
+msgid "%s remove"
+msgid_plural "%s removes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/resolver.cc:1626
+#, c-format
+msgid "%s keep"
+msgid_plural "%s keeps"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/resolver.cc:1632
+#, c-format
+msgid "%s upgrade"
+msgid_plural "%s upgrades"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/resolver.cc:1638
+#, fuzzy, c-format
+#| msgid "%lu downgraded, "
+msgid "%s downgrade"
+msgid_plural "%s downgrades"
+msgstr[0] "ปรับรุ่นลง %lu, "
+msgstr[1] "ปรับรุ่นลง %lu, "
+
+#: src/gtk/resolver.cc:1644
+#, c-format
+msgid "%s unresolved recommendation"
+msgid_plural "%s unresolved recommendations"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtk/resolver.cc:1936
 msgid "No solutions yet."
 msgstr ""
 
-#: src/gtk/resolver.cc:652
+#: src/gtk/resolver.cc:1943
+msgid "No dependency solution was found."
+msgstr ""
+
+#: src/gtk/resolver.cc:1944
+msgid "No solutions."
+msgstr ""
+
+#: src/gtk/resolver.cc:1955
+msgid "To view a solution, select it from the list to the right."
+msgstr ""
+
+#: src/gtk/resolver.cc:1956
 #, c-format
-msgid "Solution %d of %d (score: %d)"
+msgid "%u solutions."
 msgstr ""
 
-#: src/gtk/resolver.cc:746 src/ui.cc:2093
-msgid "Unable to find a solution to apply."
+#: src/gtk/resolver.cc:1987
+#, c-format
+msgid "Solution %s of %s (tier %s)."
 msgstr ""
 
-#: src/gtk/resolver.cc:751 src/ui.cc:2099
-msgid "Ran out of time while trying to find a solution."
+#: src/gtk/tab.cc:64
+msgid "Download"
 msgstr ""
 
 #: src/load_config.cc:48
@@ -4265,200 +4663,200 @@ msgstr ""
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:94
+#: src/main.cc:103
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:112
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:111
+#: src/main.cc:120
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:114
+#: src/main.cc:123
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:116
+#: src/main.cc:125
 msgid "Compiled against:\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:126
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:120
+#: src/main.cc:129
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 
-#: src/main.cc:122
+#: src/main.cc:131
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:133
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:135
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:137
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:131
+#: src/main.cc:140
 msgid ""
 "\n"
 "Current library versions:\n"
 msgstr ""
 
-#: src/main.cc:132
+#: src/main.cc:141
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:133
+#: src/main.cc:142
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr ""
 
-#: src/main.cc:134
+#: src/main.cc:143
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 
-#: src/main.cc:140
+#: src/main.cc:149
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:142
+#: src/main.cc:151
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:144
+#: src/main.cc:153
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:145
+#: src/main.cc:154
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:146
+#: src/main.cc:155
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:147
+#: src/main.cc:156
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:148
+#: src/main.cc:157
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:149
+#: src/main.cc:158
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:150
+#: src/main.cc:159
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:151
+#: src/main.cc:160
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:152
+#: src/main.cc:161
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:153
+#: src/main.cc:162
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:154
+#: src/main.cc:163
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:155
+#: src/main.cc:164
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:156
+#: src/main.cc:165
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:157
+#: src/main.cc:166
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:158
+#: src/main.cc:167
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:159
+#: src/main.cc:168
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:160
+#: src/main.cc:169
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:161
+#: src/main.cc:170
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:162
+#: src/main.cc:171
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:163
+#: src/main.cc:172
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package\n"
 msgstr ""
 
-#: src/main.cc:164
+#: src/main.cc:173
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -4466,7 +4864,7 @@ msgid ""
 "                why one or more packages would require the given package\n"
 msgstr ""
 
-#: src/main.cc:166
+#: src/main.cc:175
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -4475,195 +4873,284 @@ msgid ""
 "                lead to a conflict with the given package if installed\n"
 msgstr ""
 
-#: src/main.cc:170
+#: src/main.cc:179
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:180
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:172
+#: src/main.cc:181
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:173
+#: src/main.cc:182
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:174
+#: src/main.cc:183
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:175
+#: src/main.cc:184
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:176
+#: src/main.cc:185
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:177
+#: src/main.cc:186
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:178
+#: src/main.cc:187
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:188
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:180
+#: src/main.cc:189
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:181
+#: src/main.cc:190
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:191
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:183
+#: src/main.cc:192
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:193
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:185
+#: src/main.cc:194
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:186
+#: src/main.cc:195
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:187
+#: src/main.cc:196
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr ""
 
-#: src/main.cc:189
+#: src/main.cc:198
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:190
+#: src/main.cc:199
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:192
+#: src/main.cc:201
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:193
+#: src/main.cc:202
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:194
+#: src/main.cc:203
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:196
+#: src/main.cc:205
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:399
+#. ForTranslators: This is a log level that the user can pass on
+#. the command-line or set in the configuration file.
+#: src/main.cc:323
+msgid "trace"
+msgstr ""
+
+#. ForTranslators: This is a log level that the user can pass on
+#. the command-line or set in the configuration file.
+#: src/main.cc:326
+msgid "debug"
+msgstr ""
+
+#. ForTranslators: This is a log level that the user can pass on
+#. the command-line or set in the configuration file.
+#: src/main.cc:329
+msgid "info"
+msgstr ""
+
+#. ForTranslators: This is a log level that the user can pass on
+#. the command-line or set in the configuration file.
+#: src/main.cc:332
+msgid "warn"
+msgstr ""
+
+#. ForTranslators: This is a log level that the user can pass on
+#. the command-line or set in the configuration file.
+#: src/main.cc:335
+#, fuzzy
+#| msgid "Err "
+msgid "error"
+msgstr "ปัญหา "
+
+#. ForTranslators: This is a log level that the user can pass on
+#. the command-line or set in the configuration file.
+#: src/main.cc:338
+msgid "fatal"
+msgstr ""
+
+#. ForTranslators: This is a log level that the user can pass on
+#. the command-line or set in the configuration file.
+#: src/main.cc:341
+msgid "off"
+msgstr ""
+
+#. ForTranslators: both the translated and the untranslated
+#. log level names are accepted here.
+#: src/main.cc:411
+#, c-format
+msgid ""
+"Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
+"\"warn\", \"error\", \"fatal\", or \"off\")."
+msgstr ""
+
+#: src/main.cc:424
+#, fuzzy, c-format
+#| msgid "Invalid operation %s"
+msgid "Invalid logger name \"%s\"."
+msgstr "ไม่รู้จักคำสั่ง %s"
+
+#: src/main.cc:620
 #, c-format
 msgid "Expected a number after -q=\n"
 msgstr ""
 
-#: src/main.cc:408
+#: src/main.cc:629
 #, c-format
 msgid "Expected a number after -q=, got %s\n"
 msgstr ""
 
-#: src/main.cc:432
+#: src/main.cc:653
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s\n"
 msgstr ""
 
-#: src/main.cc:532
+#: src/main.cc:753
 #, c-format
 msgid "No comma following tag name \"%s\".\n"
 msgstr ""
 
-#: src/main.cc:573 src/main.cc:582
+#: src/main.cc:812 src/main.cc:821
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:602
+#: src/main.cc:827
+msgid "no-summary"
+msgstr ""
+
+#: src/main.cc:829
+msgid "last-package"
+msgstr ""
+
+#: src/main.cc:831
+msgid "last-package-and-type"
+msgstr ""
+
+#: src/main.cc:833
+msgid "all-packages"
+msgstr ""
+
+#: src/main.cc:835
+msgid "all-packages-with-dep-versions"
+msgstr ""
+
+#. ForTranslators: "why" here is the aptitude command name and
+#. should not be translated.
+#: src/main.cc:841
+#, c-format
+msgid ""
+"Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"last-package"
+"\", \"last-package-and-type\", \"all-packages\", or \"all-packages-with-dep-"
+"versions\"."
+msgstr ""
+
+#: src/main.cc:880
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:610
+#: src/main.cc:888
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:631
+#: src/main.cc:909
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:693
+#: src/main.cc:973
 #, c-format
 msgid ""
 "The options --safe-resolver and --full-resolver are not meaningful\n"
 "for %s, which always uses the safe resolver.\n"
 msgstr ""
 
-#: src/main.cc:750
+#: src/main.cc:1030
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:762 src/main.cc:827
+#: src/main.cc:1042 src/main.cc:1107
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:766 src/main.cc:831
+#: src/main.cc:1046 src/main.cc:1111
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -4678,7 +5165,7 @@ msgstr ""
 msgid "Search backwards for: "
 msgstr ""
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1700
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1701
 msgid "Minesweeper"
 msgstr ""
 
@@ -4886,7 +5373,7 @@ msgstr ""
 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:88 src/ui.cc:2651
+#: src/pkg_columnizer.cc:88 src/ui.cc:2652
 msgid "Package"
 msgstr ""
 
@@ -4898,6 +5385,10 @@ msgstr ""
 msgid "DebSz"
 msgstr ""
 
+#: src/pkg_columnizer.cc:92
+msgid "Action"
+msgstr ""
+
 #: src/pkg_columnizer.cc:94
 msgid "InstVer"
 msgstr ""
@@ -5275,72 +5766,72 @@ msgid ""
 "s' if you are."
 msgstr ""
 
-#: src/pkg_item.cc:233 src/pkg_ver_item.cc:683 src/solution_item.cc:298
+#: src/pkg_item.cc:235 src/pkg_ver_item.cc:683 src/solution_item.cc:299
 #, c-format
 msgid "Information about %s"
 msgstr ""
 
-#: src/pkg_item.cc:235 src/pkg_ver_item.cc:685 src/solution_item.cc:296
+#: src/pkg_item.cc:237 src/pkg_ver_item.cc:685 src/solution_item.cc:297
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: src/pkg_item.cc:331
+#: src/pkg_item.cc:333
 #, c-format
 msgid "Available versions of %s"
 msgstr ""
 
-#: src/pkg_item.cc:334
+#: src/pkg_item.cc:336
 #, c-format
 msgid "%s versions"
 msgstr ""
 
-#: src/pkg_item.cc:346 src/pkg_ver_item.cc:713
+#: src/pkg_item.cc:348 src/pkg_ver_item.cc:713
 #, c-format
 msgid "Dependencies of %s"
 msgstr ""
 
-#: src/pkg_item.cc:348 src/pkg_ver_item.cc:715
+#: src/pkg_item.cc:350 src/pkg_ver_item.cc:715
 #, c-format
 msgid "%s deps"
 msgstr ""
 
-#: src/pkg_item.cc:359 src/pkg_ver_item.cc:725
+#: src/pkg_item.cc:361 src/pkg_ver_item.cc:725
 #, c-format
 msgid "Packages depending on %s"
 msgstr ""
 
-#: src/pkg_item.cc:361 src/pkg_ver_item.cc:727
+#: src/pkg_item.cc:363 src/pkg_ver_item.cc:727
 #, c-format
 msgid "%s reverse deps"
 msgstr ""
 
-#: src/pkg_item.cc:411 src/pkg_ver_item.cc:775
+#: src/pkg_item.cc:413 src/pkg_ver_item.cc:775
 #, c-format
 msgid "Reporting a bug in %s:\n"
 msgstr ""
 
-#: src/pkg_item.cc:431
+#: src/pkg_item.cc:433
 msgid ""
 "You are not root and I cannot find any way to become root.  To reconfigure "
 "this package, install the menu package, the login package, or run aptitude "
 "as root."
 msgstr ""
 
-#: src/pkg_item.cc:439
+#: src/pkg_item.cc:441
 #, c-format
 msgid "Reconfiguring %s\n"
 msgstr ""
 
-#: src/pkg_item.cc:449 src/ui.cc:1160
+#: src/pkg_item.cc:451 src/ui.cc:1160
 msgid "Press return to continue.\n"
 msgstr ""
 
-#: src/pkg_item.cc:466
+#: src/pkg_item.cc:468
 msgid "Hierarchy editor"
 msgstr ""
 
-#: src/pkg_item.cc:466 src/pkg_view.cc:669
+#: src/pkg_item.cc:468 src/pkg_view.cc:670
 msgid "Hierarchy Editor"
 msgstr ""
 
@@ -5380,34 +5871,34 @@ msgstr ""
 msgid "Couldn't parse column definition"
 msgstr ""
 
-#: src/pkg_view.cc:219
+#: src/pkg_view.cc:220
 msgid ""
 "If you select a package, an explanation of why it should be installed or "
 "removed will appear in this space."
 msgstr ""
 
-#: src/pkg_view.cc:571
+#: src/pkg_view.cc:572
 msgid "make_package_view: error in arguments -- two main widgets??"
 msgstr ""
 
-#: src/pkg_view.cc:577
+#: src/pkg_view.cc:578
 msgid ""
 "make_package_view: error in arguments -- bad column list for static item"
 msgstr ""
 
-#: src/pkg_view.cc:674
+#: src/pkg_view.cc:675
 msgid "Related Dependencies"
 msgstr ""
 
-#: src/pkg_view.cc:677
+#: src/pkg_view.cc:678
 msgid "Why Installed"
 msgstr ""
 
-#: src/pkg_view.cc:696
+#: src/pkg_view.cc:697
 msgid "make_package_view: bad argument!"
 msgstr ""
 
-#: src/pkg_view.cc:748
+#: src/pkg_view.cc:749
 msgid "make_package_view: no main widget found"
 msgstr ""
 
@@ -5603,7 +6094,7 @@ msgid ""
 "broken if it is %s."
 msgstr ""
 
-#: src/solution_dialog.cc:97 src/solution_screen.cc:478
+#: src/solution_dialog.cc:97 src/solution_screen.cc:504
 msgid "The package cache is not available."
 msgstr ""
 
@@ -5611,7 +6102,7 @@ msgstr ""
 msgid "No packages are broken."
 msgstr ""
 
-#: src/solution_dialog.cc:114 src/solution_screen.cc:501
+#: src/solution_dialog.cc:114 src/solution_screen.cc:527
 msgid "No resolution found."
 msgstr ""
 
@@ -5631,107 +6122,117 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: src/solution_fragment.cc:140
+#: src/solution_fragment.cc:142
 #, c-format
 msgid "%s conflicts with %s [provided by %s %s]"
 msgstr ""
 
-#: src/solution_fragment.cc:150
+#: src/solution_fragment.cc:155
 #, c-format
 msgid "Removing %s"
 msgstr "กำลังถอดถอน %s"
 
-#: src/solution_fragment.cc:152
+#: src/solution_fragment.cc:157
 #, c-format
 msgid "Installing %s %s (%s)"
 msgstr ""
 
-#: src/solution_fragment.cc:221
+#: src/solution_fragment.cc:162
+#, c-format
+msgid "Leave %ls unresolved."
+msgstr ""
+
+#: src/solution_fragment.cc:245
 msgid "%BRemove%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:231
+#: src/solution_fragment.cc:255
 msgid "%BInstall%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:244
+#: src/solution_fragment.cc:268
 msgid "%BKeep%b the following packages at their current version:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:264
+#: src/solution_fragment.cc:288
 msgid "%BUpgrade%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:279
+#: src/solution_fragment.cc:303
 msgid "%BDowngrade%b the following packages:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:296
+#: src/solution_fragment.cc:318
 #, c-format
 msgid "Leave the following dependencies unresolved:%n"
 msgstr ""
 
-#: src/solution_fragment.cc:304
+#: src/solution_fragment.cc:325
 #, c-format
-msgid "Score is %d"
+msgid "Tier: %s"
 msgstr ""
 
-#: src/solution_item.cc:96
+#: src/solution_item.cc:97
 #, c-format
 msgid "Remove %F [%s (%s)]"
 msgstr ""
 
-#: src/solution_item.cc:103
+#: src/solution_item.cc:104
 #, c-format
 msgid "Install %F [%s (%s)]"
 msgstr ""
 
-#: src/solution_item.cc:111
+#: src/solution_item.cc:112
 #, c-format
 msgid "Cancel the installation of %F"
 msgstr ""
 
-#: src/solution_item.cc:114
+#: src/solution_item.cc:115
 #, c-format
 msgid "Cancel the removal of %F"
 msgstr ""
 
-#: src/solution_item.cc:117
+#: src/solution_item.cc:118
 #, c-format
 msgid "Keep %F at version %s (%s)"
 msgstr ""
 
-#: src/solution_item.cc:125
+#: src/solution_item.cc:126
 #, c-format
 msgid "Upgrade %F [%s (%s) -> %s (%s)]"
 msgstr ""
 
-#: src/solution_item.cc:134
+#: src/solution_item.cc:135
 #, c-format
 msgid "Downgrade %F [%s (%s) -> %s (%s)]"
 msgstr ""
 
-#: src/solution_item.cc:606
+#: src/solution_item.cc:607
 #, c-format
 msgid "-> Leave the dependency \"%s recommends %s\" unresolved."
 msgstr ""
 
-#: src/solution_screen.cc:157
+#: src/solution_screen.cc:163
 msgid "The following actions will resolve this dependency:"
 msgstr ""
 
-#: src/solution_screen.cc:259
+#: src/solution_screen.cc:283
 msgid "Keep the following packages at their current version:"
 msgstr ""
 
-#: src/solution_screen.cc:305
+#: src/solution_screen.cc:331
 msgid "Leave the following recommendations unresolved:"
 msgstr ""
 
-#: src/solution_screen.cc:485
+#: src/solution_screen.cc:511
 msgid "No broken packages."
 msgstr ""
 
+#: src/solution_screen.cc:541
+#, c-format
+msgid "open: %d; closed: %d; defer: %d; conflict: %d"
+msgstr ""
+
 #: src/trust.cc:19 src/trust.cc:21
 msgid "WARNING"
 msgstr ""
@@ -5792,6 +6293,12 @@ msgstr ""
 msgid "Invalid Get-Root-Command; it should start with su: or sudo:, not %s:"
 msgstr ""
 
+#: src/ui.cc:469
+#, fuzzy, c-format
+#| msgid "Unable to stat %s."
+msgid "Unable to fork: %s"
+msgstr "ไม่สามารถ stat %s"
+
 #: src/ui.cc:562
 msgid ""
 "Subprocess exited with an error -- did you type your password correctly?"
@@ -5809,7 +6316,7 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: src/ui.cc:697 src/ui.cc:2417
+#: src/ui.cc:697 src/ui.cc:2418
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -5845,7 +6352,7 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: src/ui.cc:1029 src/ui.cc:2509
+#: src/ui.cc:1029 src/ui.cc:2510
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 
@@ -5865,7 +6372,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1058 src/ui.cc:2656
+#: src/ui.cc:1058 src/ui.cc:2657
 msgid "Help"
 msgstr ""
 
@@ -5893,7 +6400,7 @@ msgstr ""
 msgid "FAQ"
 msgstr ""
 
-#: src/ui.cc:1088 src/ui.cc:2501
+#: src/ui.cc:1088 src/ui.cc:2502
 msgid "View a list of frequently asked questions"
 msgstr ""
 
@@ -5985,553 +6492,561 @@ msgid ""
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1455 src/ui.cc:1688
+#: src/ui.cc:1455 src/ui.cc:1689
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:1457 src/ui.cc:1690
+#: src/ui.cc:1457 src/ui.cc:1691
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:1577
+#: src/ui.cc:1578
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1583
+#: src/ui.cc:1584
 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:1641 src/ui.cc:1770
+#: src/ui.cc:1642 src/ui.cc:1771
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
-#: src/ui.cc:1658
+#: src/ui.cc:1659
 msgid "Updating package lists"
 msgstr ""
 
-#: src/ui.cc:1659
+#: src/ui.cc:1660
 msgid "View the progress of the package list update"
 msgstr ""
 
-#: src/ui.cc:1660
+#: src/ui.cc:1661
 msgid "List Update"
 msgstr ""
 
-#: src/ui.cc:1685
+#: src/ui.cc:1686
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1707 src/ui.cc:1767
+#: src/ui.cc:1708 src/ui.cc:1768
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1710
+#: src/ui.cc:1711
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1724
+#: src/ui.cc:1725
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1764
+#: src/ui.cc:1765
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 
-#: src/ui.cc:1790
+#: src/ui.cc:1791
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1887
+#: src/ui.cc:1888
 msgid "No more solutions."
 msgstr ""
 
-#: src/ui.cc:2159 src/ui.cc:2161
+#: src/ui.cc:2094
+msgid "Unable to find a solution to apply."
+msgstr ""
+
+#: src/ui.cc:2100
+msgid "Ran out of time while trying to find a solution."
+msgstr ""
+
+#: src/ui.cc:2160 src/ui.cc:2162
 msgid "Resolve Dependencies"
 msgstr ""
 
-#: src/ui.cc:2160
+#: src/ui.cc:2161
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2172
+#: src/ui.cc:2173
 #, c-format
 msgid "Unable to open %ls"
 msgstr ""
 
-#: src/ui.cc:2178
+#: src/ui.cc:2179
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:2188
+#: src/ui.cc:2189
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:2218
+#: src/ui.cc:2219
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:2221
+#: src/ui.cc:2222
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:2226
+#: src/ui.cc:2227
 msgid "Mark Up^gradable"
 msgstr ""
 
-#: src/ui.cc:2231
+#: src/ui.cc:2232
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:2235
+#: src/ui.cc:2236
 msgid "Canc^el pending actions"
 msgstr ""
 
-#: src/ui.cc:2239
+#: src/ui.cc:2240
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:2243
+#: src/ui.cc:2244
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:2250
+#: src/ui.cc:2251
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:2255
+#: src/ui.cc:2256
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:2260
+#: src/ui.cc:2261
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:2263
+#: src/ui.cc:2264
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:2270 src/ui.cc:2650
+#: src/ui.cc:2271 src/ui.cc:2651
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:2279
+#: src/ui.cc:2280
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:2280
+#: src/ui.cc:2281
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:2283
+#: src/ui.cc:2284
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:2284
+#: src/ui.cc:2285
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:2287
+#: src/ui.cc:2288
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:2288
+#: src/ui.cc:2289
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:2291
+#: src/ui.cc:2292
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:2292
+#: src/ui.cc:2293
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:2295
+#: src/ui.cc:2296
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:2296
+#: src/ui.cc:2297
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:2299
+#: src/ui.cc:2300
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:2300
+#: src/ui.cc:2301
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
 msgstr ""
 
-#: src/ui.cc:2303
+#: src/ui.cc:2304
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:2304
+#: src/ui.cc:2305
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:2307
+#: src/ui.cc:2308
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:2308
+#: src/ui.cc:2309
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
 msgstr ""
 
-#: src/ui.cc:2312
+#: src/ui.cc:2313
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:2313
+#: src/ui.cc:2314
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:2316
+#: src/ui.cc:2317
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2317
+#: src/ui.cc:2318
 msgid ""
 "Cycle through the modes of the package information area: it can show the "
 "package's long description, a summary of its dependency status, or an "
 "analysis of why the package is required."
 msgstr ""
 
-#: src/ui.cc:2320
+#: src/ui.cc:2321
 msgid "^Changelog"
 msgstr ""
 
-#: src/ui.cc:2321
+#: src/ui.cc:2322
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:2328
+#: src/ui.cc:2329
 msgid "^Examine Solution"
 msgstr ""
 
-#: src/ui.cc:2329
+#: src/ui.cc:2330
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2332
+#: src/ui.cc:2333
 msgid "Apply ^Solution"
 msgstr ""
 
-#: src/ui.cc:2333
+#: src/ui.cc:2334
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 
-#: src/ui.cc:2336
+#: src/ui.cc:2337
 msgid "^Next Solution"
 msgstr ""
 
-#: src/ui.cc:2337
+#: src/ui.cc:2338
 msgid "Select the next solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2340
+#: src/ui.cc:2341
 msgid "^Previous Solution"
 msgstr ""
 
-#: src/ui.cc:2341
+#: src/ui.cc:2342
 msgid "Select the previous solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2344
+#: src/ui.cc:2345
 msgid "^First Solution"
 msgstr ""
 
-#: src/ui.cc:2345
+#: src/ui.cc:2346
 msgid "Select the first solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2348
+#: src/ui.cc:2349
 msgid "^Last Solution"
 msgstr ""
 
-#: src/ui.cc:2349
+#: src/ui.cc:2350
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 
-#: src/ui.cc:2355
+#: src/ui.cc:2356
 msgid "Toggle ^Rejected"
 msgstr ""
 
-#: src/ui.cc:2356
+#: src/ui.cc:2357
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 
-#: src/ui.cc:2360
+#: src/ui.cc:2361
 msgid "Toggle ^Approved"
 msgstr ""
 
-#: src/ui.cc:2361
+#: src/ui.cc:2362
 msgid "Toggle whether the currently selected action is approved."
 msgstr ""
 
-#: src/ui.cc:2365
+#: src/ui.cc:2366
 msgid "^View Target"
 msgstr ""
 
-#: src/ui.cc:2366
+#: src/ui.cc:2367
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 
-#: src/ui.cc:2372
+#: src/ui.cc:2373
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2374
+#: src/ui.cc:2375
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2382
+#: src/ui.cc:2383
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:2383
+#: src/ui.cc:2384
 msgid "Search forwards"
 msgstr ""
 
-#: src/ui.cc:2386
+#: src/ui.cc:2387
 msgid "^Find Backwards"
 msgstr ""
 
-#: src/ui.cc:2387
+#: src/ui.cc:2388
 msgid "Search backwards"
 msgstr ""
 
-#: src/ui.cc:2390
+#: src/ui.cc:2391
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:2391
+#: src/ui.cc:2392
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:2394
+#: src/ui.cc:2395
 msgid "Find Again ^Backwards"
 msgstr ""
 
-#: src/ui.cc:2395
+#: src/ui.cc:2396
 msgid "Repeat the last search in the opposite direction"
 msgstr ""
 
-#: src/ui.cc:2399
+#: src/ui.cc:2400
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:2400
+#: src/ui.cc:2401
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:2403
+#: src/ui.cc:2404
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:2404
+#: src/ui.cc:2405
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:2408
+#: src/ui.cc:2409
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:2409
+#: src/ui.cc:2410
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2416
+#: src/ui.cc:2417
 msgid "^Preferences"
 msgstr ""
 
-#: src/ui.cc:2421
+#: src/ui.cc:2422
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:2422
+#: src/ui.cc:2423
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:2425
+#: src/ui.cc:2426
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:2426
+#: src/ui.cc:2427
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:2429
+#: src/ui.cc:2430
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:2430
+#: src/ui.cc:2431
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:2436
+#: src/ui.cc:2437
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:2437
+#: src/ui.cc:2438
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:2448
+#: src/ui.cc:2449
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:2449
+#: src/ui.cc:2450
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:2452
+#: src/ui.cc:2453
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:2453
+#: src/ui.cc:2454
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:2456
+#: src/ui.cc:2457
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:2457
+#: src/ui.cc:2458
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:2462
+#: src/ui.cc:2463
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:2463
+#: src/ui.cc:2464
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:2466
+#: src/ui.cc:2467
 msgid "Audit ^Recommendations"
 msgstr ""
 
-#: src/ui.cc:2467
+#: src/ui.cc:2468
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 
-#: src/ui.cc:2470
+#: src/ui.cc:2471
 msgid "New ^Flat Package List"
 msgstr ""
 
-#: src/ui.cc:2471
+#: src/ui.cc:2472
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 
-#: src/ui.cc:2474
+#: src/ui.cc:2475
 msgid "New ^Debtags Browser"
 msgstr ""
 
-#: src/ui.cc:2476
+#: src/ui.cc:2477
 msgid "Browse packages using Debtags data"
 msgstr ""
 
-#: src/ui.cc:2479
+#: src/ui.cc:2480
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:2481
+#: src/ui.cc:2482
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:2489
+#: src/ui.cc:2490
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:2490
+#: src/ui.cc:2491
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:2493
+#: src/ui.cc:2494
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:2494
+#: src/ui.cc:2495
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:2496
+#: src/ui.cc:2497
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:2497
+#: src/ui.cc:2498
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:2500
+#: src/ui.cc:2501
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:2504
+#: src/ui.cc:2505
 msgid "^News"
 msgstr ""
 
-#: src/ui.cc:2505
+#: src/ui.cc:2506
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:2508
+#: src/ui.cc:2509
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:2649
+#: src/ui.cc:2650
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:2653
+#: src/ui.cc:2654
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:2654
+#: src/ui.cc:2655
 msgid "Options"
 msgstr ""
 
-#: src/ui.cc:2655
+#: src/ui.cc:2656
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:2721
+#: src/ui.cc:2722
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:3063
+#: src/ui.cc:3064
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:3064
+#: src/ui.cc:3065
 msgid "no_key"
 msgstr ""